diff options
Diffstat (limited to 'src/fr-window.c')
| -rw-r--r-- | src/fr-window.c | 307 |
1 files changed, 0 insertions, 307 deletions
diff --git a/src/fr-window.c b/src/fr-window.c index 9a30f5e..01cec22 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -103,14 +103,12 @@ static GtkTargetEntry folder_tree_targets[] = { { "XdndDirectSave0", 0, 2 } }; - typedef struct { FrBatchActionType type; void * data; GFreeFunc free_func; } FRBatchAction; - typedef struct { guint converting : 1; char *temp_dir; @@ -121,13 +119,11 @@ typedef struct { char *new_file; } FRConvertData; - typedef enum { FR_CLIPBOARD_OP_CUT, FR_CLIPBOARD_OP_COPY } FRClipboardOp; - typedef struct { GList *file_list; char *extract_to_dir; @@ -140,7 +136,6 @@ typedef struct { gboolean ask_to_open_destination; } ExtractData; - typedef enum { FR_WINDOW_AREA_MENUBAR, FR_WINDOW_AREA_TOOLBAR, @@ -150,7 +145,6 @@ typedef enum { FR_WINDOW_AREA_STATUSBAR, } FrWindowArea; - typedef enum { DIALOG_RESPONSE_NONE = 1, DIALOG_RESPONSE_OPEN_ARCHIVE, @@ -159,10 +153,8 @@ typedef enum { DIALOG_RESPONSE_QUIT } DialogResponse; - /* -- FrClipboardData -- */ - typedef struct { int refs; char *archive_filename; @@ -174,7 +166,6 @@ typedef struct { char *current_dir; } FrClipboardData; - static FrClipboardData* fr_clipboard_data_new (void) { @@ -186,7 +177,6 @@ fr_clipboard_data_new (void) return data; } - static FrClipboardData * fr_clipboard_data_ref (FrClipboardData *clipboard_data) { @@ -194,7 +184,6 @@ fr_clipboard_data_ref (FrClipboardData *clipboard_data) return clipboard_data; } - static void fr_clipboard_data_unref (FrClipboardData *clipboard_data) { @@ -212,7 +201,6 @@ fr_clipboard_data_unref (FrClipboardData *clipboard_data) g_free (clipboard_data); } - static void fr_clipboard_data_set_password (FrClipboardData *clipboard_data, const char *password) @@ -223,7 +211,6 @@ fr_clipboard_data_set_password (FrClipboardData *clipboard_data, clipboard_data->archive_password = g_strdup (password); } - /**/ enum { @@ -397,10 +384,8 @@ struct _FrWindowPrivateData { GtkWindow *error_dialog_parent; }; - /* -- fr_window_free_private_data -- */ - static void fr_window_free_batch_data (FrWindow *window) { @@ -422,7 +407,6 @@ fr_window_free_batch_data (FrWindow *window) window->priv->batch_title = NULL; } - static void gh_unref_pixbuf (gpointer key, gpointer value, @@ -431,7 +415,6 @@ gh_unref_pixbuf (gpointer key, g_object_unref (value); } - static void fr_window_clipboard_remove_file_list (FrWindow *window, GList *file_list) @@ -472,7 +455,6 @@ fr_window_clipboard_remove_file_list (FrWindow *window, } } - static void fr_window_history_clear (FrWindow *window) { @@ -484,7 +466,6 @@ fr_window_history_clear (FrWindow *window) window->priv->last_location = NULL; } - static void fr_window_free_open_files (FrWindow *window) { @@ -501,7 +482,6 @@ fr_window_free_open_files (FrWindow *window) window->priv->open_files = NULL; } - static void fr_window_convert_data_free (FrWindow *window, gboolean all) @@ -529,7 +509,6 @@ fr_window_convert_data_free (FrWindow *window, } } - static void fr_window_free_private_data (FrWindow *window) { @@ -624,7 +603,6 @@ fr_window_free_private_data (FrWindow *window) _g_object_unref (window->priv->settings_caja); } - static void fr_window_finalize (GObject *object) { @@ -656,7 +634,6 @@ fr_window_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - static gboolean close__step2 (gpointer data) { @@ -664,7 +641,6 @@ close__step2 (gpointer data) return FALSE; } - void fr_window_close (FrWindow *window) { @@ -693,7 +669,6 @@ fr_window_close (FrWindow *window) g_idle_add (close__step2, window); } - static void fr_window_class_init (FrWindowClass *class) { @@ -734,10 +709,8 @@ fr_window_class_init (FrWindowClass *class) gobject_class->finalize = fr_window_finalize; } - static void fr_window_update_paste_command_sensitivity (FrWindow *, GtkClipboard *); - static void clipboard_owner_change_cb (GtkClipboard *clipboard, GdkEvent *event, @@ -746,7 +719,6 @@ clipboard_owner_change_cb (GtkClipboard *clipboard, fr_window_update_paste_command_sensitivity ((FrWindow *) user_data, clipboard); } - static void fr_window_realized (GtkWidget *window, gpointer *data) @@ -760,7 +732,6 @@ fr_window_realized (GtkWidget *window, window); } - static void fr_window_unrealized (GtkWidget *window, gpointer *data) @@ -773,7 +744,6 @@ fr_window_unrealized (GtkWidget *window, window); } - static void fr_window_init (FrWindow *window) { @@ -799,7 +769,6 @@ fr_window_init (FrWindow *window) NULL); } - GType fr_window_get_type (void) { @@ -828,10 +797,8 @@ fr_window_get_type (void) return type; } - /* -- window history -- */ - #if 0 static void fr_window_history_print (FrWindow *window) @@ -847,7 +814,6 @@ fr_window_history_print (FrWindow *window) } #endif - static void fr_window_history_add (FrWindow *window, const char *path) @@ -886,7 +852,6 @@ fr_window_history_add (FrWindow *window, } } - static void fr_window_history_pop (FrWindow *window) { @@ -903,10 +868,8 @@ fr_window_history_pop (FrWindow *window) g_list_free (first); } - /* -- window_update_file_list -- */ - static GPtrArray * fr_window_get_current_dir_list (FrWindow *window) { @@ -926,7 +889,6 @@ fr_window_get_current_dir_list (FrWindow *window) return files; } - static gint sort_by_name (gconstpointer ptr1, gconstpointer ptr2) @@ -944,7 +906,6 @@ sort_by_name (gconstpointer ptr1, return strcmp (fdata1->sort_key, fdata2->sort_key); } - static gint sort_by_size (gconstpointer ptr1, gconstpointer ptr2) @@ -973,7 +934,6 @@ sort_by_size (gconstpointer ptr1, return -1; } - static gint sort_by_type (gconstpointer ptr1, gconstpointer ptr2) @@ -1002,7 +962,6 @@ sort_by_type (gconstpointer ptr1, return result; } - static gint sort_by_time (gconstpointer ptr1, gconstpointer ptr2) @@ -1027,7 +986,6 @@ sort_by_time (gconstpointer ptr1, return -1; } - static gint sort_by_path (gconstpointer ptr1, gconstpointer ptr2) @@ -1054,7 +1012,6 @@ sort_by_path (gconstpointer ptr1, return result; } - static guint64 get_dir_size (FrWindow *window, const char *current_dir, @@ -1081,7 +1038,6 @@ get_dir_size (FrWindow *window, return size; } - static gboolean file_data_respects_filter (FrWindow *window, FileData *fdata) @@ -1098,7 +1054,6 @@ file_data_respects_filter (FrWindow *window, return strncasecmp (fdata->name, filter, strlen (filter)) == 0; } - static gboolean compute_file_list_name (FrWindow *window, FileData *fdata, @@ -1157,7 +1112,6 @@ compute_file_list_name (FrWindow *window, return TRUE; } - static void fr_window_compute_list_names (FrWindow *window, GPtrArray *files) @@ -1198,7 +1152,6 @@ fr_window_compute_list_names (FrWindow *window, g_hash_table_destroy (names_hash); } - static gboolean fr_window_dir_exists_in_archive (FrWindow *window, const char *dir_name) @@ -1233,7 +1186,6 @@ fr_window_dir_exists_in_archive (FrWindow *window, return FALSE; } - static char * get_parent_dir (const char *current_dir) { @@ -1261,10 +1213,8 @@ get_parent_dir (const char *current_dir) return retval; } - static void fr_window_update_statusbar_list_info (FrWindow *window); - static GdkPixbuf * get_mime_type_icon (const char *mime_type) { @@ -1287,7 +1237,6 @@ get_mime_type_icon (const char *mime_type) return pixbuf; } - static GdkPixbuf * get_icon (FileData *fdata) { @@ -1301,7 +1250,6 @@ get_icon (FileData *fdata) return get_mime_type_icon (content_type); } - static GdkPixbuf * get_emblem (FileData *fdata) { @@ -1311,7 +1259,6 @@ get_emblem (FileData *fdata) return get_mime_type_icon ("emblem-nowrite"); } - static int get_column_from_sort_method (FrWindowSortMethod sort_method) { @@ -1328,7 +1275,6 @@ get_column_from_sort_method (FrWindowSortMethod sort_method) return COLUMN_NAME; } - static int get_sort_method_from_column (int column_id) { @@ -1345,7 +1291,6 @@ get_sort_method_from_column (int column_id) return FR_WINDOW_SORT_BY_NAME; } - static void add_selected_from_list_view (GtkTreeModel *model, GtkTreePath *path, @@ -1361,7 +1306,6 @@ add_selected_from_list_view (GtkTreeModel *model, *list = g_list_prepend (*list, fdata); } - static void add_selected_from_tree_view (GtkTreeModel *model, GtkTreePath *path, @@ -1377,7 +1321,6 @@ add_selected_from_tree_view (GtkTreeModel *model, *list = g_list_prepend (*list, dir_path); } - static void add_selected_fd (GtkTreeModel *model, GtkTreePath *path, @@ -1394,7 +1337,6 @@ add_selected_fd (GtkTreeModel *model, *list = g_list_prepend (*list, fdata); } - static GList * get_selection_as_fd (FrWindow *window) { @@ -1412,7 +1354,6 @@ get_selection_as_fd (FrWindow *window) return list; } - static void fr_window_update_statusbar_list_info (FrWindow *window) { @@ -1488,7 +1429,6 @@ fr_window_update_statusbar_list_info (FrWindow *window) g_free (info); } - static void fr_window_populate_file_list (FrWindow *window, GPtrArray *files) @@ -1599,7 +1539,6 @@ fr_window_populate_file_list (FrWindow *window, fr_window_stop_activity_mode (window); } - static int path_compare (gconstpointer a, gconstpointer b) @@ -1610,7 +1549,6 @@ path_compare (gconstpointer a, return strcmp (path_a, path_b); } - static gboolean get_tree_iter_from_path (FrWindow *window, const char *path, @@ -1647,7 +1585,6 @@ get_tree_iter_from_path (FrWindow *window, return result; } - static void set_sensitive (FrWindow *window, const char *action_name, @@ -1659,7 +1596,6 @@ set_sensitive (FrWindow *window, g_object_set (action, "sensitive", sensitive, NULL); } - static void fr_window_update_current_location (FrWindow *window) { @@ -1703,7 +1639,6 @@ fr_window_update_current_location (FrWindow *window) g_free (path); } - static void fr_window_update_dir_tree (FrWindow *window) { @@ -1833,7 +1768,6 @@ fr_window_update_dir_tree (FrWindow *window) fr_window_update_current_location (window); } - static void fr_window_update_filter_bar_visibility (FrWindow *window) { @@ -1846,7 +1780,6 @@ fr_window_update_filter_bar_visibility (FrWindow *window) gtk_widget_show (window->priv->filter_bar); } - static void fr_window_update_file_list (FrWindow *window, gboolean update_view) @@ -1926,14 +1859,12 @@ fr_window_update_file_list (FrWindow *window, g_ptr_array_free (files, TRUE); } - void fr_window_update_list_order (FrWindow *window) { gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (window->priv->list_store), get_column_from_sort_method (window->priv->sort_method), window->priv->sort_type); } - static void fr_window_update_title (FrWindow *window) { @@ -1954,7 +1885,6 @@ fr_window_update_title (FrWindow *window) } } - static void check_whether_has_a_dir (GtkTreeModel *model, GtkTreePath *path, @@ -1971,7 +1901,6 @@ check_whether_has_a_dir (GtkTreeModel *model, *has_a_dir = TRUE; } - static gboolean selection_has_a_dir (FrWindow *window) { @@ -1992,7 +1921,6 @@ selection_has_a_dir (FrWindow *window) return has_a_dir; } - static void set_active (FrWindow *window, const char *action_name, @@ -2004,7 +1932,6 @@ set_active (FrWindow *window, gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), is_active); } - static void fr_window_update_paste_command_sensitivity (FrWindow *window, GtkClipboard *clipboard) @@ -2027,7 +1954,6 @@ fr_window_update_paste_command_sensitivity (FrWindow *window, set_sensitive (window, "Paste", ! no_archive && ! ro && ! running && ! compr_file && (window->priv->list_mode != FR_WINDOW_LIST_MODE_FLAT) && gtk_clipboard_wait_is_target_available (clipboard, FR_SPECIAL_URI_LIST)); } - static void fr_window_update_sensitivity (FrWindow *window) { @@ -2103,7 +2029,6 @@ fr_window_update_sensitivity (FrWindow *window) set_sensitive (window, "ViewAsFolder", ! window->priv->filter_mode); } - static gboolean location_entry_key_press_event_cb (GtkWidget *widget, GdkEventKey *event, @@ -2119,7 +2044,6 @@ location_entry_key_press_event_cb (GtkWidget *widget, return FALSE; } - static gboolean real_close_progress_dialog (gpointer data) { @@ -2136,7 +2060,6 @@ real_close_progress_dialog (gpointer data) return FALSE; } - static void close_suspend_process(FrWindow *window) { if (window->archive->process != NULL) @@ -2176,7 +2099,6 @@ close_progress_dialog (FrWindow *window, close_suspend_process(window); } - static gboolean progress_dialog_delete_event (GtkWidget *caller, GdkEvent *event, @@ -2190,7 +2112,6 @@ progress_dialog_delete_event (GtkWidget *caller, return TRUE; } - static void open_folder (GtkWindow *parent, const char *folder) @@ -2223,7 +2144,6 @@ open_folder (GtkWindow *parent, } } - static void fr_window_view_extraction_destination_folder (FrWindow *window) { @@ -2310,7 +2230,6 @@ progress_dialog_response (GtkDialog *dialog, } } - static char* get_action_description (FrAction action, const char *uri) @@ -2376,7 +2295,6 @@ get_action_description (FrAction action, return message; } - static void progress_dialog_update_action_description (FrWindow *window) { @@ -2407,7 +2325,6 @@ progress_dialog_update_action_description (FrWindow *window) g_free (description); } - static gboolean fr_window_working_archive_cb (FrCommand *command, const char *archive_filename, @@ -2422,7 +2339,6 @@ fr_window_working_archive_cb (FrCommand *command, return TRUE; } - static gboolean fr_window_message_cb (FrCommand *command, const char *msg, @@ -2479,7 +2395,6 @@ fr_window_message_cb (FrCommand *command, return TRUE; } - static GtkWidget* dialog_add_button_with_icon_name (GtkDialog *dialog, const gchar *button_text, @@ -2500,7 +2415,6 @@ dialog_add_button_with_icon_name (GtkDialog *dialog, return button; } - static void create_the_progress_dialog (FrWindow *window) { @@ -2626,7 +2540,6 @@ create_the_progress_dialog (FrWindow *window) window); } - static gboolean display_progress_dialog (gpointer data) { @@ -2651,7 +2564,6 @@ display_progress_dialog (gpointer data) return FALSE; } - static void open_progress_dialog (FrWindow *window, gboolean open_now) @@ -2691,7 +2603,6 @@ open_progress_dialog (FrWindow *window, window); } - static gboolean fr_window_progress_cb (FrArchive *archive, double fraction, @@ -2743,7 +2654,6 @@ fr_window_progress_cb (FrArchive *archive, return TRUE; } - static void open_progress_dialog_with_open_destination (FrWindow *window) { @@ -2771,7 +2681,6 @@ open_progress_dialog_with_open_destination (FrWindow *window) fr_window_message_cb (NULL, _("Extraction completed successfully"), window); } - static void open_progress_dialog_with_open_archive (FrWindow *window) { @@ -2796,7 +2705,6 @@ open_progress_dialog_with_open_archive (FrWindow *window) fr_window_message_cb (NULL, _("Archive created successfully"), window); } - void fr_window_push_message (FrWindow *window, const char *msg) @@ -2809,7 +2717,6 @@ fr_window_push_message (FrWindow *window, msg); } - void fr_window_pop_message (FrWindow *window) { @@ -2820,7 +2727,6 @@ fr_window_pop_message (FrWindow *window) gtk_label_set_text (GTK_LABEL (window->priv->pd_message), ""); } - static void action_started (FrArchive *archive, FrAction action, @@ -2855,7 +2761,6 @@ action_started (FrArchive *archive, } } - static void fr_window_add_to_recent_list (FrWindow *window, char *uri) @@ -2881,7 +2786,6 @@ fr_window_add_to_recent_list (FrWindow *window, gtk_recent_manager_add_item (gtk_recent_manager_get_default (), uri); } - static void fr_window_remove_from_recent_list (FrWindow *window, char *filename) @@ -2890,7 +2794,6 @@ fr_window_remove_from_recent_list (FrWindow *window, gtk_recent_manager_remove_item (gtk_recent_manager_get_default (), filename, NULL); } - static void error_dialog_response_cb (GtkDialog *dialog, gint arg1, @@ -2910,7 +2813,6 @@ error_dialog_response_cb (GtkDialog *dialog, gtk_widget_destroy (GTK_WIDGET (window)); } - static void fr_window_show_error_dialog (FrWindow *window, GtkWidget *dialog, @@ -2949,14 +2851,12 @@ fr_window_show_error_dialog (FrWindow *window, window->priv->error_dialog_parent = dialog_parent; } - void fr_window_destroy_with_error_dialog (FrWindow *window) { window->priv->destroy_with_error_dialog = TRUE; } - static gboolean handle_errors (FrWindow *window, FrArchive *archive, @@ -3085,7 +2985,6 @@ handle_errors (FrWindow *window, return TRUE; } - static void convert__action_performed (FrArchive *archive, FrAction action, @@ -3119,10 +3018,8 @@ convert__action_performed (FrArchive *archive, fr_window_update_statusbar_list_info (window); } - static void fr_window_exec_next_batch_action (FrWindow *window); - static void action_performed (FrArchive *archive, FrAction action, @@ -3312,13 +3209,10 @@ action_performed (FrArchive *archive, } } - /* -- selections -- */ - #undef DEBUG_GET_DIR_LIST_FROM_PATH - static GList * get_dir_list_from_path (FrWindow *window, char *path) @@ -3366,7 +3260,6 @@ get_dir_list_from_path (FrWindow *window, return g_list_reverse (list); } - static GList * get_dir_list_from_file_data (FrWindow *window, FileData *fdata) @@ -3383,7 +3276,6 @@ get_dir_list_from_file_data (FrWindow *window, return list; } - GList * fr_window_get_file_list_selection (FrWindow *window, gboolean recursive, @@ -3425,7 +3317,6 @@ fr_window_get_file_list_selection (FrWindow *window, return g_list_reverse (list); } - GList * fr_window_get_folder_tree_selection (FrWindow *window, gboolean recursive, @@ -3463,7 +3354,6 @@ fr_window_get_folder_tree_selection (FrWindow *window, return g_list_reverse (list); } - GList * fr_window_get_file_list_from_path_list (FrWindow *window, GList *path_list, @@ -3522,7 +3412,6 @@ fr_window_get_file_list_from_path_list (FrWindow *window, return g_list_reverse (list); } - GList * fr_window_get_file_list_pattern (FrWindow *window, const char *pattern) @@ -3554,7 +3443,6 @@ fr_window_get_file_list_pattern (FrWindow *window, return g_list_reverse (list); } - static GList * fr_window_get_file_list (FrWindow *window) { @@ -3572,17 +3460,14 @@ fr_window_get_file_list (FrWindow *window) return g_list_reverse (list); } - int fr_window_get_n_selected_files (FrWindow *window) { return gtk_tree_selection_count_selected_rows (gtk_tree_view_get_selection (GTK_TREE_VIEW (window->priv->list_view))); } - /**/ - static int dir_tree_button_press_cb (GtkWidget *widget, GdkEventButton *event, @@ -3637,7 +3522,6 @@ dir_tree_button_press_cb (GtkWidget *widget, return FALSE; } - static FileData * fr_window_get_selected_item_from_file_list (FrWindow *window) { @@ -3665,7 +3549,6 @@ fr_window_get_selected_item_from_file_list (FrWindow *window) return fdata; } - static char * fr_window_get_selected_folder_in_tree_view (FrWindow *window) { @@ -3690,7 +3573,6 @@ fr_window_get_selected_folder_in_tree_view (FrWindow *window) return path; } - void fr_window_current_folder_activated (FrWindow *window, gboolean from_sidebar) @@ -3722,7 +3604,6 @@ fr_window_current_folder_activated (FrWindow *window, g_free (dir_path); } - static gboolean row_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, @@ -3760,7 +3641,6 @@ row_activated_cb (GtkTreeView *tree_view, return FALSE; } - static int file_button_press_cb (GtkWidget *widget, GdkEventButton *event, @@ -3848,7 +3728,6 @@ file_button_press_cb (GtkWidget *widget, return FALSE; } - static int file_button_release_cb (GtkWidget *widget, GdkEventButton *event, @@ -3901,7 +3780,6 @@ file_button_release_cb (GtkWidget *widget, return FALSE; } - static gboolean file_motion_notify_callback (GtkWidget *widget, GdkEventMotion *event, @@ -3960,7 +3838,6 @@ file_motion_notify_callback (GtkWidget *widget, return FALSE; } - static gboolean file_leave_notify_callback (GtkWidget *widget, GdkEventCrossing *event, @@ -3984,10 +3861,8 @@ file_leave_notify_callback (GtkWidget *widget, return FALSE; } - /* -- drag and drop -- */ - static GList * get_uri_list_from_selection_data (char *uri_list) { @@ -4006,7 +3881,6 @@ get_uri_list_from_selection_data (char *uri_list) return g_list_reverse (list); } - static gboolean fr_window_drag_motion (GtkWidget *widget, GdkDragContext *context, @@ -4027,10 +3901,8 @@ fr_window_drag_motion (GtkWidget *widget, return TRUE; } - static void fr_window_paste_from_clipboard_data (FrWindow *window, FrClipboardData *data); - static FrClipboardData* get_clipboard_data_from_selection_data (FrWindow *window, const char *data) @@ -4060,7 +3932,6 @@ get_clipboard_data_from_selection_data (FrWindow *window, return clipboard_data; } - static void fr_window_drag_data_received (GtkWidget *widget, GdkDragContext *context, @@ -4229,7 +4100,6 @@ fr_window_drag_data_received (GtkWidget *widget, debug (DEBUG_INFO, "::DragDataReceived <--\n"); } - static gboolean file_list_drag_begin (GtkWidget *widget, GdkDragContext *context, @@ -4257,7 +4127,6 @@ file_list_drag_begin (GtkWidget *widget, return TRUE; } - static void file_list_drag_end (GtkWidget *widget, GdkDragContext *context, @@ -4292,7 +4161,6 @@ file_list_drag_end (GtkWidget *widget, debug (DEBUG_INFO, "::DragEnd <--\n"); } - /* The following three functions taken from bugzilla * (http://bugzilla.mate.org/attachment.cgi?id=49362&action=view) * Author: Christian Neumair @@ -4321,7 +4189,6 @@ get_xds_atom_value (GdkDragContext *context) return ret; } - static gboolean context_offers_target (GdkDragContext *context, GdkAtom target) @@ -4329,7 +4196,6 @@ context_offers_target (GdkDragContext *context, return (g_list_find (gdk_drag_context_list_targets (context), target) != NULL); } - static gboolean caja_xds_dnd_is_valid_xds_context (GdkDragContext *context) { @@ -4349,7 +4215,6 @@ caja_xds_dnd_is_valid_xds_context (GdkDragContext *context) return ret; } - static char * get_selection_data_from_clipboard_data (FrWindow *window, FrClipboardData *data) @@ -4380,7 +4245,6 @@ get_selection_data_from_clipboard_data (FrWindow *window, return g_string_free (list, FALSE); } - static gboolean fr_window_folder_tree_drag_data_get (GtkWidget *widget, GdkDragContext *context, @@ -4463,7 +4327,6 @@ fr_window_folder_tree_drag_data_get (GtkWidget *widget, return TRUE; } - gboolean fr_window_file_list_drag_data_get (FrWindow *window, GdkDragContext *context, @@ -4543,10 +4406,8 @@ fr_window_file_list_drag_data_get (FrWindow *window, return TRUE; } - /* -- window_new -- */ - static void fr_window_deactivate_filter (FrWindow *window) { @@ -4564,7 +4425,6 @@ fr_window_deactivate_filter (FrWindow *window) fr_window_update_current_location (window); } - static gboolean key_press_cb (GtkWidget *widget, GdkEventKey *event, @@ -4657,7 +4517,6 @@ key_press_cb (GtkWidget *widget, return retval; } - static gboolean dir_tree_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data) @@ -4679,7 +4538,6 @@ dir_tree_selection_changed_cb (GtkTreeSelection *selection, return FALSE; } - static gboolean selection_changed_cb (GtkTreeSelection *selection, gpointer user_data) @@ -4692,7 +4550,6 @@ selection_changed_cb (GtkTreeSelection *selection, return FALSE; } - static void fr_window_delete_event_cb (GtkWidget *caller, GdkEvent *event, @@ -4701,7 +4558,6 @@ fr_window_delete_event_cb (GtkWidget *caller, fr_window_close (window); } - static gboolean is_single_click_policy (FrWindow *window) { @@ -4718,7 +4574,6 @@ is_single_click_policy (FrWindow *window) return result; } - static void filename_cell_data_func (GtkTreeViewColumn *column, GtkCellRenderer *renderer, @@ -4757,7 +4612,6 @@ filename_cell_data_func (GtkTreeViewColumn *column, g_free (text); } - static void add_dir_tree_columns (FrWindow *window, GtkTreeView *treeview) @@ -4802,7 +4656,6 @@ add_dir_tree_columns (FrWindow *window, gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); } - static void add_file_list_columns (FrWindow *window, GtkTreeView *treeview) @@ -4894,7 +4747,6 @@ add_file_list_columns (FrWindow *window, } } - static int name_column_sort_func (GtkTreeModel *model, GtkTreeIter *a, @@ -4909,7 +4761,6 @@ name_column_sort_func (GtkTreeModel *model, return sort_by_name (&fdata1, &fdata2); } - static int size_column_sort_func (GtkTreeModel *model, GtkTreeIter *a, @@ -4924,7 +4775,6 @@ size_column_sort_func (GtkTreeModel *model, return sort_by_size (&fdata1, &fdata2); } - static int type_column_sort_func (GtkTreeModel *model, GtkTreeIter *a, @@ -4939,7 +4789,6 @@ type_column_sort_func (GtkTreeModel *model, return sort_by_type (&fdata1, &fdata2); } - static int time_column_sort_func (GtkTreeModel *model, GtkTreeIter *a, @@ -4954,7 +4803,6 @@ time_column_sort_func (GtkTreeModel *model, return sort_by_time (&fdata1, &fdata2); } - static int path_column_sort_func (GtkTreeModel *model, GtkTreeIter *a, @@ -4969,7 +4817,6 @@ path_column_sort_func (GtkTreeModel *model, return sort_by_path (&fdata1, &fdata2); } - static int no_sort_column_sort_func (GtkTreeModel *model, GtkTreeIter *a, @@ -4979,7 +4826,6 @@ no_sort_column_sort_func (GtkTreeModel *model, return -1; } - static void sort_column_changed_cb (GtkTreeSortable *sortable, gpointer user_data) @@ -5000,7 +4846,6 @@ sort_column_changed_cb (GtkTreeSortable *sortable, set_active (window, "SortReverseOrder", (window->priv->sort_type == GTK_SORT_DESCENDING));*/ } - static gboolean fr_window_show_cb (GtkWidget *widget, FrWindow *window) @@ -5018,10 +4863,8 @@ fr_window_show_cb (GtkWidget *widget, return TRUE; } - /* preferences changes notification callbacks */ - static void pref_history_len_changed (GSettings *settings, const char *key, @@ -5040,7 +4883,6 @@ pref_history_len_changed (GSettings *settings, gtk_recent_chooser_set_limit (GTK_RECENT_CHOOSER (action), limit); } - static void pref_view_toolbar_changed (GSettings *settings, const char *key, @@ -5051,7 +4893,6 @@ pref_view_toolbar_changed (GSettings *settings, fr_window_set_toolbar_visibility (window, g_settings_get_boolean (settings, key)); } - static void pref_view_statusbar_changed (GSettings *settings, const char *key, @@ -5062,7 +4903,6 @@ pref_view_statusbar_changed (GSettings *settings, fr_window_set_statusbar_visibility (window, g_settings_get_boolean (settings, key)); } - static void pref_view_folders_changed (GSettings *settings, const char *key, @@ -5073,7 +4913,6 @@ pref_view_folders_changed (GSettings *settings, fr_window_set_folders_visibility (window, g_settings_get_boolean (settings, key)); } - static void pref_show_field_changed (GSettings *settings, const char *key, @@ -5084,7 +4923,6 @@ pref_show_field_changed (GSettings *settings, fr_window_update_columns_visibility (window); } - static void pref_click_policy_changed (GSettings *settings, const char *key, @@ -5102,7 +4940,6 @@ pref_click_policy_changed (GSettings *settings, gdk_display_flush (display); } - static void pref_use_mime_icons_changed (GSettings *settings, const char *key, @@ -5122,7 +4959,6 @@ pref_use_mime_icons_changed (GSettings *settings, fr_window_update_dir_tree (window); } - static void theme_changed_cb (GtkIconTheme *theme, FrWindow *window) { @@ -5140,7 +4976,6 @@ theme_changed_cb (GtkIconTheme *theme, FrWindow *window) fr_window_update_dir_tree (window); } - static gboolean fr_window_stoppable_cb (FrCommand *command, gboolean stoppable, @@ -5155,7 +4990,6 @@ fr_window_stoppable_cb (FrCommand *command, return TRUE; } - static gboolean fr_window_fake_load (FrArchive *archive, gpointer data) @@ -5205,7 +5039,6 @@ fr_window_fake_load (FrArchive *archive, #endif } - static void menu_item_select_cb (GtkMenuItem *proxy, FrWindow *window) @@ -5224,7 +5057,6 @@ menu_item_select_cb (GtkMenuItem *proxy, } } - static void menu_item_deselect_cb (GtkMenuItem *proxy, FrWindow *window) @@ -5233,7 +5065,6 @@ menu_item_deselect_cb (GtkMenuItem *proxy, window->priv->help_message_cid); } - static void disconnect_proxy_cb (GtkUIManager *manager, GtkAction *action, @@ -5248,7 +5079,6 @@ disconnect_proxy_cb (GtkUIManager *manager, } } - static void connect_proxy_cb (GtkUIManager *manager, GtkAction *action, @@ -5263,7 +5093,6 @@ connect_proxy_cb (GtkUIManager *manager, } } - static void view_as_radio_action (GtkAction *action, GtkRadioAction *current, @@ -5273,7 +5102,6 @@ view_as_radio_action (GtkAction *action, fr_window_set_list_mode (window, gtk_radio_action_get_current_value (current)); } - static void sort_by_radio_action (GtkAction *action, GtkRadioAction *current, @@ -5286,7 +5114,6 @@ sort_by_radio_action (GtkAction *action, fr_window_update_list_order (window); } - static void recent_chooser_item_activated_cb (GtkRecentChooser *chooser, FrWindow *window) @@ -5300,7 +5127,6 @@ recent_chooser_item_activated_cb (GtkRecentChooser *chooser, } } - static void fr_window_init_recent_chooser (FrWindow *window, GtkRecentChooser *chooser) @@ -5328,7 +5154,6 @@ fr_window_init_recent_chooser (FrWindow *window, window); } - static void close_sidepane_button_clicked_cb (GtkButton *button, FrWindow *window) @@ -5336,7 +5161,6 @@ close_sidepane_button_clicked_cb (GtkButton *button, fr_window_set_folders_visibility (window, FALSE); } - static void fr_window_activate_filter (FrWindow *window) { @@ -5356,7 +5180,6 @@ fr_window_activate_filter (FrWindow *window) fr_window_update_current_location (window); } - static void filter_entry_activate_cb (GtkEntry *entry, FrWindow *window) @@ -5364,7 +5187,6 @@ filter_entry_activate_cb (GtkEntry *entry, fr_window_activate_filter (window); } - static void filter_entry_icon_release_cb (GtkEntry *entry, GtkEntryIconPosition icon_pos, @@ -5377,7 +5199,6 @@ filter_entry_icon_release_cb (GtkEntry *entry, fr_window_deactivate_filter (window); } - static void fr_window_attach (FrWindow *window, GtkWidget *child, @@ -5426,7 +5247,6 @@ fr_window_attach (FrWindow *window, 1, 1); } - static void set_action_important (GtkUIManager *ui, const char *action_name) @@ -5438,7 +5258,6 @@ set_action_important (GtkUIManager *ui, g_object_unref (action); } - static void fr_window_construct (FrWindow *window) { @@ -5916,7 +5735,6 @@ fr_window_construct (FrWindow *window) GDK_KEY_q, GDK_CONTROL_MASK, 0, g_cclosure_new_swap (G_CALLBACK (fr_window_close), window, NULL)); - if (! gtk_ui_manager_add_ui_from_resource (ui, ENGRAMPA_RESOURCE_UI_PATH G_DIR_SEPARATOR_S "menus-toolbars.ui", &error)) { g_message ("building menus failed: %s", error->message); g_error_free (error); @@ -6088,7 +5906,6 @@ fr_window_construct (FrWindow *window) gtk_widget_grab_focus (window->priv->list_view); } - GtkWidget * fr_window_new (void) { @@ -6100,7 +5917,6 @@ fr_window_new (void) return window; } - static void fr_window_set_archive_uri (FrWindow *window, const char *uri) @@ -6110,7 +5926,6 @@ fr_window_set_archive_uri (FrWindow *window, window->priv->archive_uri = g_strdup (uri); } - gboolean fr_window_archive_new (FrWindow *window, const char *uri) @@ -6141,7 +5956,6 @@ fr_window_archive_new (FrWindow *window, return TRUE; } - FrWindow * fr_window_archive_open (FrWindow *current_window, const char *uri, @@ -6171,7 +5985,6 @@ fr_window_archive_open (FrWindow *current_window, return window; } - void fr_window_archive_close (FrWindow *window) { @@ -6199,7 +6012,6 @@ fr_window_archive_close (FrWindow *window) fr_window_update_statusbar_list_info (window); } - const char * fr_window_get_archive_uri (FrWindow *window) { @@ -6208,7 +6020,6 @@ fr_window_get_archive_uri (FrWindow *window) return window->priv->archive_uri; } - const char * fr_window_get_paste_archive_uri (FrWindow *window) { @@ -6220,7 +6031,6 @@ fr_window_get_paste_archive_uri (FrWindow *window) return NULL; } - gboolean fr_window_archive_is_present (FrWindow *window) { @@ -6229,7 +6039,6 @@ fr_window_archive_is_present (FrWindow *window) return window->priv->archive_present; } - typedef struct { char *uri; char *password; @@ -6237,7 +6046,6 @@ typedef struct { guint volume_size; } SaveAsData; - static SaveAsData * save_as_data_new (const char *uri, const char *password, @@ -6257,7 +6065,6 @@ save_as_data_new (const char *uri, return sdata; } - static void save_as_data_free (SaveAsData *sdata) { @@ -6268,7 +6075,6 @@ save_as_data_free (SaveAsData *sdata) g_free (sdata); } - void fr_window_archive_save_as (FrWindow *window, const char *uri, @@ -6363,7 +6169,6 @@ fr_window_archive_save_as (FrWindow *window, fr_process_start (window->archive->process); } - void fr_window_archive_reload (FrWindow *window) { @@ -6377,10 +6182,8 @@ fr_window_archive_reload (FrWindow *window) fr_archive_reload (window->archive, window->priv->password); } - /**/ - void fr_window_archive_add_files (FrWindow *window, GList *file_list, /* GFile list */ @@ -6429,7 +6232,6 @@ fr_window_archive_add_files (FrWindow *window, g_object_unref (base); } - void fr_window_archive_add_with_wildcard (FrWindow *window, const char *include_files, @@ -6454,7 +6256,6 @@ fr_window_archive_add_with_wildcard (FrWindow *window, window->priv->volume_size); } - void fr_window_archive_add_directory (FrWindow *window, const char *directory, @@ -6473,7 +6274,6 @@ fr_window_archive_add_directory (FrWindow *window, window->priv->volume_size); } - void fr_window_archive_add_items (FrWindow *window, GList *item_list, @@ -6492,7 +6292,6 @@ fr_window_archive_add_items (FrWindow *window, window->priv->volume_size); } - void fr_window_archive_add_dropped_items (FrWindow *window, GList *item_list, @@ -6509,7 +6308,6 @@ fr_window_archive_add_dropped_items (FrWindow *window, window->priv->volume_size); } - void fr_window_archive_remove (FrWindow *window, GList *file_list) @@ -6521,10 +6319,8 @@ fr_window_archive_remove (FrWindow *window, fr_process_start (window->archive->process); } - /* -- window_archive_extract -- */ - static ExtractData* extract_data_new (GList *file_list, const char *extract_to_dir, @@ -6552,7 +6348,6 @@ extract_data_new (GList *file_list, return edata; } - static ExtractData* extract_to_data_new (const char *extract_to_dir) { @@ -6566,7 +6361,6 @@ extract_to_data_new (const char *extract_to_dir) FALSE); } - static void extract_data_free (ExtractData *edata) { @@ -6579,7 +6373,6 @@ extract_data_free (ExtractData *edata) g_free (edata); } - static gboolean archive_is_encrypted (FrWindow *window, GList *file_list) @@ -6625,7 +6418,6 @@ archive_is_encrypted (FrWindow *window, return encrypted; } - void fr_window_archive_extract_here (FrWindow *window, gboolean skip_older, @@ -6665,10 +6457,8 @@ fr_window_archive_extract_here (FrWindow *window, } } - /* -- fr_window_archive_extract -- */ - typedef struct { FrWindow *window; ExtractData *edata; @@ -6676,12 +6466,10 @@ typedef struct { gboolean extract_all; } OverwriteData; - #define _FR_RESPONSE_OVERWRITE_YES_ALL 100 #define _FR_RESPONSE_OVERWRITE_YES 101 #define _FR_RESPONSE_OVERWRITE_NO 102 - static void _fr_window_archive_extract_from_edata (FrWindow *window, ExtractData *edata) @@ -6700,10 +6488,8 @@ _fr_window_archive_extract_from_edata (FrWindow *window, fr_process_start (window->archive->process); } - static void _fr_window_ask_overwrite_dialog (OverwriteData *odata); - static void overwrite_dialog_response_cb (GtkDialog *dialog, int response_id, @@ -6752,7 +6538,6 @@ overwrite_dialog_response_cb (GtkDialog *dialog, _fr_window_ask_overwrite_dialog (odata); } - static void _fr_window_ask_overwrite_dialog (OverwriteData *odata) { @@ -6855,7 +6640,6 @@ _fr_window_ask_overwrite_dialog (OverwriteData *odata) g_free (odata); } - void fr_window_archive_extract (FrWindow *window, GList *file_list, @@ -6978,7 +6762,6 @@ fr_window_archive_extract (FrWindow *window, _fr_window_archive_extract_from_edata (window, edata); } - void fr_window_archive_test (FrWindow *window) { @@ -6989,7 +6772,6 @@ fr_window_archive_test (FrWindow *window) fr_archive_test (window->archive, window->priv->password); } - void fr_window_set_password (FrWindow *window, const char *password) @@ -7028,7 +6810,6 @@ fr_window_get_password (FrWindow *window) return window->priv->password; } - void fr_window_set_encrypt_header (FrWindow *window, gboolean encrypt_header) @@ -7038,14 +6819,12 @@ fr_window_set_encrypt_header (FrWindow *window, window->priv->encrypt_header = encrypt_header; } - gboolean fr_window_get_encrypt_header (FrWindow *window) { return window->priv->encrypt_header; } - void fr_window_set_compression (FrWindow *window, FrCompression compression) @@ -7055,14 +6834,12 @@ fr_window_set_compression (FrWindow *window, window->priv->compression = compression; } - FrCompression fr_window_get_compression (FrWindow *window) { return window->priv->compression; } - void fr_window_set_volume_size (FrWindow *window, guint volume_size) @@ -7072,14 +6849,12 @@ fr_window_set_volume_size (FrWindow *window, window->priv->volume_size = volume_size; } - guint fr_window_get_volume_size (FrWindow *window) { return window->priv->volume_size; } - void fr_window_go_to_location (FrWindow *window, const char *path, @@ -7112,7 +6887,6 @@ fr_window_go_to_location (FrWindow *window, g_free (dir); } - const char * fr_window_get_current_location (FrWindow *window) { @@ -7124,7 +6898,6 @@ fr_window_get_current_location (FrWindow *window) return (const char*) window->priv->history_current->data; } - void fr_window_go_up_one_level (FrWindow *window) { @@ -7137,7 +6910,6 @@ fr_window_go_up_one_level (FrWindow *window) g_free (parent_dir); } - void fr_window_go_back (FrWindow *window) { @@ -7154,7 +6926,6 @@ fr_window_go_back (FrWindow *window) fr_window_go_to_location (window, window->priv->history_current->data, FALSE); } - void fr_window_go_forward (FrWindow *window) { @@ -7171,7 +6942,6 @@ fr_window_go_forward (FrWindow *window) fr_window_go_to_location (window, window->priv->history_current->data, FALSE); } - void fr_window_set_list_mode (FrWindow *window, FrWindowListMode list_mode) @@ -7192,14 +6962,12 @@ fr_window_set_list_mode (FrWindow *window, fr_window_update_current_location (window); } - GtkTreeModel * fr_window_get_list_store (FrWindow *window) { return GTK_TREE_MODEL (window->priv->list_store); } - void fr_window_find (FrWindow *window) { @@ -7208,21 +6976,18 @@ fr_window_find (FrWindow *window) gtk_widget_grab_focus (window->priv->filter_entry); } - void fr_window_select_all (FrWindow *window) { gtk_tree_selection_select_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (window->priv->list_view))); } - void fr_window_unselect_all (FrWindow *window) { gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (window->priv->list_view))); } - void fr_window_set_sort_type (FrWindow *window, GtkSortType sort_type) @@ -7231,7 +6996,6 @@ fr_window_set_sort_type (FrWindow *window, fr_window_update_list_order (window); } - void fr_window_stop (FrWindow *window) { @@ -7245,10 +7009,8 @@ fr_window_stop (FrWindow *window) fr_window_convert_data_free (window, TRUE); } - /* -- start/stop activity mode -- */ - static int activity_cb (gpointer data) { @@ -7262,7 +7024,6 @@ activity_cb (gpointer data) return TRUE; } - void fr_window_start_activity_mode (FrWindow *window) { @@ -7277,7 +7038,6 @@ fr_window_start_activity_mode (FrWindow *window) fr_window_update_sensitivity (window); } - void fr_window_stop_activity_mode (FrWindow *window) { @@ -7310,7 +7070,6 @@ fr_window_stop_activity_mode (FrWindow *window) } } - static gboolean last_output_window__unrealize_cb (GtkWidget *widget, gpointer data) @@ -7319,7 +7078,6 @@ last_output_window__unrealize_cb (GtkWidget *widget, return FALSE; } - static void fr_window_view_last_output_print(GtkTextBuffer *text_buffer, GtkTextIter *iter, @@ -7419,10 +7177,8 @@ fr_window_view_last_output (FrWindow *window, pref_util_restore_window_geometry (GTK_WINDOW (dialog), LAST_OUTPUT_DIALOG_NAME); } - /* -- fr_window_rename_selection -- */ - typedef struct { char *path_to_rename; char *old_name; @@ -7433,7 +7189,6 @@ typedef struct { char *original_path; } RenameData; - static RenameData* rename_data_new (const char *path_to_rename, const char *old_name, @@ -7461,7 +7216,6 @@ rename_data_new (const char *path_to_rename, return rdata; } - static void rename_data_free (RenameData *rdata) { @@ -7475,7 +7229,6 @@ rename_data_free (RenameData *rdata) g_free (rdata); } - static void rename_selection (FrWindow *window, const char *path_to_rename, @@ -7631,7 +7384,6 @@ rename_selection (FrWindow *window, g_free (tmp_dir); } - static gboolean valid_name (const char *new_name, const char *old_name, @@ -7664,7 +7416,6 @@ valid_name (const char *new_name, return retval; } - static gboolean name_is_present (FrWindow *window, const char *current_dir, @@ -7705,7 +7456,6 @@ name_is_present (FrWindow *window, return retval; } - void fr_window_rename_selection (FrWindow *window, gboolean from_sidebar) @@ -7833,7 +7583,6 @@ fr_window_rename_selection (FrWindow *window, g_free (original_path); } - static void fr_clipboard_get (GtkClipboard *clipboard, GtkSelectionData *selection_data, @@ -7855,7 +7604,6 @@ fr_clipboard_get (GtkClipboard *clipboard, g_free (data); } - static void fr_clipboard_clear (GtkClipboard *clipboard, gpointer user_data_or_owner) @@ -7868,7 +7616,6 @@ fr_clipboard_clear (GtkClipboard *clipboard, } } - GList * fr_window_get_selection (FrWindow *window, gboolean from_sidebar, @@ -7906,7 +7653,6 @@ fr_window_get_selection (FrWindow *window, return files; } - static void fr_window_copy_or_cut_selection (FrWindow *window, FRClipboardOp op, @@ -7936,7 +7682,6 @@ fr_window_copy_or_cut_selection (FrWindow *window, fr_window_update_sensitivity (window); } - void fr_window_copy_selection (FrWindow *window, gboolean from_sidebar) @@ -7944,7 +7689,6 @@ fr_window_copy_selection (FrWindow *window, fr_window_copy_or_cut_selection (window, FR_CLIPBOARD_OP_COPY, from_sidebar); } - void fr_window_cut_selection (FrWindow *window, gboolean from_sidebar) @@ -7952,7 +7696,6 @@ fr_window_cut_selection (FrWindow *window, fr_window_copy_or_cut_selection (window, FR_CLIPBOARD_OP_CUT, from_sidebar); } - static gboolean always_fake_load (FrArchive *archive, gpointer data) @@ -7960,7 +7703,6 @@ always_fake_load (FrArchive *archive, return TRUE; } - static void add_pasted_files (FrWindow *window, FrClipboardData *data) @@ -8022,7 +7764,6 @@ add_pasted_files (FrWindow *window, fr_process_start (window->archive->process); } - static void copy_from_archive_action_performed_cb (FrArchive *archive, FrAction action, @@ -8088,7 +7829,6 @@ copy_from_archive_action_performed_cb (FrArchive *archive, } } - static void fr_window_paste_from_clipboard_data (FrWindow *window, FrClipboardData *data) @@ -8166,7 +7906,6 @@ fr_window_paste_from_clipboard_data (FrWindow *window, data->archive_password); } - static void fr_window_paste_selection_to (FrWindow *window, const char *current_dir) @@ -8187,7 +7926,6 @@ fr_window_paste_selection_to (FrWindow *window, gtk_selection_data_free (selection_data); } - void fr_window_paste_selection (FrWindow *window, gboolean from_sidebar) @@ -8228,10 +7966,8 @@ fr_window_paste_selection (FrWindow *window, g_free (current_dir); } - /* -- fr_window_open_files -- */ - void fr_window_open_files_with_command (FrWindow *window, GList *file_list, @@ -8253,7 +7989,6 @@ fr_window_open_files_with_command (FrWindow *window, fr_window_open_files_with_application (window, file_list, app); } - void fr_window_open_files_with_application (FrWindow *window, GList *file_list, @@ -8289,7 +8024,6 @@ fr_window_open_files_with_application (FrWindow *window, path_list_free (uris); } - typedef struct { FrWindow *window; GList *file_list; @@ -8297,7 +8031,6 @@ typedef struct { CommandData *cdata; } OpenFilesData; - static OpenFilesData* open_files_data_new (FrWindow *window, GList *file_list, @@ -8331,7 +8064,6 @@ open_files_data_new (FrWindow *window, return odata; } - static void open_files_data_free (OpenFilesData *odata) { @@ -8341,14 +8073,12 @@ open_files_data_free (OpenFilesData *odata) g_free (odata); } - void fr_window_update_dialog_closed (FrWindow *window) { window->priv->update_dialog = NULL; } - gboolean fr_window_update_files (FrWindow *window, GList *file_list) @@ -8386,7 +8116,6 @@ fr_window_update_files (FrWindow *window, return TRUE; } - static void open_file_modified_cb (GFileMonitor *monitor, GFile *monitor_file, @@ -8423,7 +8152,6 @@ open_file_modified_cb (GFileMonitor *monitor, dlg_update_add_file (window->priv->update_dialog, file); } - static void fr_window_monitor_open_file (FrWindow *window, OpenFile *file) @@ -8440,7 +8168,6 @@ fr_window_monitor_open_file (FrWindow *window, g_object_unref (f); } - static void monitor_extracted_files (OpenFilesData *odata) { @@ -8461,7 +8188,6 @@ monitor_extracted_files (OpenFilesData *odata) } } - static gboolean fr_window_open_extracted_files (OpenFilesData *odata) { @@ -8542,7 +8268,6 @@ fr_window_open_extracted_files (OpenFilesData *odata) return result; } - static void fr_window_open_files__extract_done_cb (FrArchive *archive, FrAction action, @@ -8562,7 +8287,6 @@ fr_window_open_files__extract_done_cb (FrArchive *archive, fr_window_open_extracted_files (odata); } - void fr_window_open_files (FrWindow *window, GList *file_list, @@ -8596,10 +8320,8 @@ fr_window_open_files (FrWindow *window, fr_process_start (window->archive->process); } - /**/ - static char* get_default_dir (const char *dir) { @@ -8609,7 +8331,6 @@ get_default_dir (const char *dir) return NULL; } - void fr_window_set_open_default_dir (FrWindow *window, const char *default_dir) @@ -8622,7 +8343,6 @@ fr_window_set_open_default_dir (FrWindow *window, window->priv->open_default_dir = get_default_dir (default_dir); } - const char * fr_window_get_open_default_dir (FrWindow *window) { @@ -8632,7 +8352,6 @@ fr_window_get_open_default_dir (FrWindow *window) return window->priv->open_default_dir; } - void fr_window_set_add_default_dir (FrWindow *window, const char *default_dir) @@ -8645,7 +8364,6 @@ fr_window_set_add_default_dir (FrWindow *window, window->priv->add_default_dir = get_default_dir (default_dir); } - const char * fr_window_get_add_default_dir (FrWindow *window) { @@ -8655,7 +8373,6 @@ fr_window_get_add_default_dir (FrWindow *window) return window->priv->add_default_dir; } - void fr_window_set_extract_default_dir (FrWindow *window, const char *default_dir, @@ -8676,7 +8393,6 @@ fr_window_set_extract_default_dir (FrWindow *window, window->priv->extract_default_dir = get_default_dir (default_dir); } - const char * fr_window_get_extract_default_dir (FrWindow *window) { @@ -8686,7 +8402,6 @@ fr_window_get_extract_default_dir (FrWindow *window) return window->priv->extract_default_dir; } - void fr_window_set_default_dir (FrWindow *window, const char *default_dir, @@ -8702,7 +8417,6 @@ fr_window_set_default_dir (FrWindow *window, fr_window_set_extract_default_dir (window, default_dir, FALSE); } - void fr_window_update_columns_visibility (FrWindow *window) { @@ -8722,7 +8436,6 @@ fr_window_update_columns_visibility (FrWindow *window) gtk_tree_view_column_set_visible (column, g_settings_get_boolean (window->priv->settings_listing, PREF_LISTING_SHOW_PATH)); } - void fr_window_set_toolbar_visibility (FrWindow *window, gboolean visible) @@ -8737,7 +8450,6 @@ fr_window_set_toolbar_visibility (FrWindow *window, set_active (window, "ViewToolbar", visible); } - void fr_window_set_statusbar_visibility (FrWindow *window, gboolean visible) @@ -8752,7 +8464,6 @@ fr_window_set_statusbar_visibility (FrWindow *window, set_active (window, "ViewStatusbar", visible); } - void fr_window_set_folders_visibility (FrWindow *window, gboolean value) @@ -8765,7 +8476,6 @@ fr_window_set_folders_visibility (FrWindow *window, set_active (window, "ViewFolders", window->priv->view_folders); } - void fr_window_use_progress_dialog (FrWindow *window, gboolean value) @@ -8773,13 +8483,10 @@ fr_window_use_progress_dialog (FrWindow *window, window->priv->use_progress_dialog = value; } - /* -- batch mode procedures -- */ - static void fr_window_exec_current_batch_action (FrWindow *window); - static void fr_window_exec_batch_action (FrWindow *window, FRBatchAction *action) @@ -8925,7 +8632,6 @@ fr_window_exec_batch_action (FrWindow *window, } } - void fr_window_reset_current_batch_action (FrWindow *window) { @@ -8938,7 +8644,6 @@ fr_window_reset_current_batch_action (FrWindow *window) adata->free_func = NULL; } - void fr_window_set_current_batch_action (FrWindow *window, FrBatchActionType action, @@ -8954,14 +8659,12 @@ fr_window_set_current_batch_action (FrWindow *window, adata->free_func = free_func; } - void fr_window_restart_current_batch_action (FrWindow *window) { fr_window_exec_batch_action (window, &window->priv->current_batch_action); } - void fr_window_append_batch_action (FrWindow *window, FrBatchActionType action, @@ -8980,7 +8683,6 @@ fr_window_append_batch_action (FrWindow *window, window->priv->batch_action_list = g_list_append (window->priv->batch_action_list, a_desc); } - static void fr_window_exec_current_batch_action (FrWindow *window) { @@ -8994,7 +8696,6 @@ fr_window_exec_current_batch_action (FrWindow *window) fr_window_exec_batch_action (window, action); } - static void fr_window_exec_next_batch_action (FrWindow *window) { @@ -9005,7 +8706,6 @@ fr_window_exec_next_batch_action (FrWindow *window) fr_window_exec_current_batch_action (window); } - void fr_window_start_batch (FrWindow *window) { @@ -9028,7 +8728,6 @@ fr_window_start_batch (FrWindow *window) fr_window_exec_current_batch_action (window); } - void fr_window_stop_batch (FrWindow *window) { @@ -9052,21 +8751,18 @@ fr_window_stop_batch (FrWindow *window) window->priv->batch_mode = FALSE; } - void fr_window_resume_batch (FrWindow *window) { fr_window_exec_current_batch_action (window); } - gboolean fr_window_is_batch_mode (FrWindow *window) { return window->priv->batch_mode; } - void fr_window_new_batch (FrWindow *window, const char *title) @@ -9077,7 +8773,6 @@ fr_window_new_batch (FrWindow *window, window->priv->batch_title = g_strdup (title); } - void fr_window_set_batch__extract_here (FrWindow *window, const char *filename) @@ -9099,7 +8794,6 @@ fr_window_set_batch__extract_here (FrWindow *window, NULL); } - void fr_window_set_batch__extract (FrWindow *window, const char *filename, @@ -9128,7 +8822,6 @@ fr_window_set_batch__extract (FrWindow *window, NULL); } - void fr_window_set_batch__add (FrWindow *window, const char *archive, |