mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-22 20:36:50 +03:00
Sync the src tree -mig
This commit is contained in:
parent
bc6b7fe871
commit
158aeb9c72
@ -97,7 +97,7 @@ extern char search_buffer [256];
|
|||||||
extern char cmd_buf [512];
|
extern char cmd_buf [512];
|
||||||
|
|
||||||
#if HAVE_GNOME
|
#if HAVE_GNOME
|
||||||
#define MENU_PANEL current_panel
|
#define MENU_PANEL get_current_panel ()
|
||||||
#define SELECTED_IS_PANEL 1
|
#define SELECTED_IS_PANEL 1
|
||||||
#else
|
#else
|
||||||
/* The menu panels */
|
/* The menu panels */
|
||||||
|
@ -107,6 +107,15 @@ typedef struct {
|
|||||||
char search_buffer [256];
|
char search_buffer [256];
|
||||||
|
|
||||||
int has_dir_sizes; /* Set if directories have sizes = to du -s */
|
int has_dir_sizes; /* Set if directories have sizes = to du -s */
|
||||||
|
|
||||||
|
#ifdef HAVE_GNOME
|
||||||
|
/* These are standard GtkWidgets */
|
||||||
|
void *table;
|
||||||
|
void *list;
|
||||||
|
void *current_dir;
|
||||||
|
void *filter_w;
|
||||||
|
void *status;
|
||||||
|
#endif
|
||||||
} WPanel;
|
} WPanel;
|
||||||
|
|
||||||
WPanel *panel_new (char *panel_name);
|
WPanel *panel_new (char *panel_name);
|
||||||
|
@ -223,6 +223,11 @@ void save_stop_handler (void)
|
|||||||
sigaction (SIGTSTP, NULL, &startup_handler);
|
sigaction (SIGTSTP, NULL, &startup_handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_GNOME
|
||||||
|
#define PORT_HAS_MY_SYSTEM 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef PORT_HAS_MY_SYSTEM
|
||||||
int my_system (int as_shell_command, const char *shell, const char *command)
|
int my_system (int as_shell_command, const char *shell, const char *command)
|
||||||
{
|
{
|
||||||
struct sigaction ignore, save_intr, save_quit, save_stop;
|
struct sigaction ignore, save_intr, save_quit, save_stop;
|
||||||
@ -275,6 +280,7 @@ int my_system (int as_shell_command, const char *shell, const char *command)
|
|||||||
|
|
||||||
return WEXITSTATUS(status);
|
return WEXITSTATUS(status);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Returns a newly allocated string, if directory does not exist, return 0 */
|
/* Returns a newly allocated string, if directory does not exist, return 0 */
|
||||||
char *tilde_expand (char *directory)
|
char *tilde_expand (char *directory)
|
||||||
|
Loading…
Reference in New Issue
Block a user