diff options
| author | rbuj <[email protected]> | 2021-10-27 17:40:17 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2021-12-11 15:59:33 +0100 |
| commit | 6c55334ad9b03006686e2db6c6f6167677a2f510 (patch) | |
| tree | b558cc0ad6d97c36b449dbcb2afecb3b9002a565 | |
| parent | 85909393571d91b3c267afe5341e54bfae5a6d50 (diff) | |
| download | engrampa-6c55334ad9b03006686e2db6c6f6167677a2f510.tar.bz2 engrampa-6c55334ad9b03006686e2db6c6f6167677a2f510.tar.xz | |
Use a blank line at most
66 files changed, 0 insertions, 1304 deletions
diff --git a/caja/caja-engrampa.c b/caja/caja-engrampa.c index ad89608..0410c4a 100644 --- a/caja/caja-engrampa.c +++ b/caja/caja-engrampa.c @@ -30,10 +30,8 @@ #include <libcaja-extension/caja-menu-provider.h> #include "caja-engrampa.h" - static GObjectClass *parent_class; - static void extract_to_callback (CajaMenuItem *item, gpointer user_data) @@ -71,7 +69,6 @@ extract_to_callback (CajaMenuItem *item, g_free (quoted_default_dir); } - static void extract_here_callback (CajaMenuItem *item, gpointer user_data) @@ -103,7 +100,6 @@ extract_here_callback (CajaMenuItem *item, g_string_free (cmd, TRUE); } - static void add_callback (CajaMenuItem *item, gpointer user_data) @@ -140,7 +136,6 @@ add_callback (CajaMenuItem *item, g_string_free (cmd, TRUE); } - static struct { const char *mime_type; gboolean is_compressed; @@ -202,14 +197,12 @@ static struct { { NULL, FALSE } }; - typedef struct { gboolean is_archive; gboolean is_derived_archive; gboolean is_compressed_archive; } FileMimeInfo; - static FileMimeInfo get_file_mime_info (CajaFileInfo *file) { @@ -246,7 +239,6 @@ get_file_mime_info (CajaFileInfo *file) return file_mime_info; } - static gboolean unsupported_scheme (CajaFileInfo *file) { @@ -272,7 +264,6 @@ unsupported_scheme (CajaFileInfo *file) return result; } - static GList * caja_fr_get_file_items (CajaMenuProvider *provider, GtkWidget *window, @@ -387,37 +378,31 @@ caja_fr_get_file_items (CajaMenuProvider *provider, return items; } - static void caja_fr_menu_provider_iface_init (CajaMenuProviderIface *iface) { iface->get_file_items = caja_fr_get_file_items; } - static void caja_fr_instance_init (CajaFr *fr) { } - static void caja_fr_class_init (CajaFrClass *class) { parent_class = g_type_class_peek_parent (class); } - static GType fr_type = 0; - GType caja_fr_get_type (void) { return fr_type; } - void caja_fr_register_type (GTypeModule *module) { diff --git a/caja/engrampa-module.c b/caja/engrampa-module.c index cda7e43..42b0b3b 100644 --- a/caja/engrampa-module.c +++ b/caja/engrampa-module.c @@ -27,7 +27,6 @@ #include <glib/gi18n-lib.h> #include "caja-engrampa.h" - void caja_module_initialize (GTypeModule*module) { @@ -37,13 +36,11 @@ caja_module_initialize (GTypeModule*module) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); } - void caja_module_shutdown (void) { } - void caja_module_list_types (const GType **types, int *num_types) diff --git a/src/actions.c b/src/actions.c index b55cab1..31a9272 100644 --- a/src/actions.c +++ b/src/actions.c @@ -44,10 +44,8 @@ #include "fr-init.h" #include "typedefs.h" - /* -- new archive -- */ - static void new_archive (DlgNewData *data, char *uri) @@ -81,7 +79,6 @@ new_archive (DlgNewData *data, gtk_widget_destroy (archive_window); } - /* when on Automatic the user provided extension needs to be supported, otherwise an existing unsupported archive can be deleted (if the user provided name matches with its name) before we find out that the @@ -99,7 +96,6 @@ is_supported_extension (GtkWidget *file_sel, return FALSE; } - static char * get_full_uri (DlgNewData *data) { @@ -137,7 +133,6 @@ get_full_uri (DlgNewData *data) return full_uri; } - static char * get_archive_filename_from_selector (DlgNewData *data) { @@ -263,7 +258,6 @@ get_archive_filename_from_selector (DlgNewData *data) return uri; } - static void new_file_response_cb (GtkWidget *w, int response, @@ -292,7 +286,6 @@ new_file_response_cb (GtkWidget *w, } } - void show_new_archive_dialog (FrWindow *window, const char *archive_name) @@ -311,7 +304,6 @@ show_new_archive_dialog (FrWindow *window, gtk_window_present (GTK_WINDOW (data->dialog)); } - void activate_action_new (GtkAction *action, gpointer data) @@ -319,10 +311,8 @@ activate_action_new (GtkAction *action, show_new_archive_dialog ((FrWindow*)data, NULL); } - /* -- open archive -- */ - static void window_archive_loaded_cb (FrWindow *window, gboolean success, @@ -339,7 +329,6 @@ window_archive_loaded_cb (FrWindow *window, } } - static void open_file_response_cb (GtkWidget *w, int response, @@ -370,7 +359,6 @@ open_file_response_cb (GtkWidget *w, g_free (uri); } - void activate_action_open (GtkAction *action, gpointer data) @@ -415,10 +403,8 @@ activate_action_open (GtkAction *action, gtk_widget_show (file_sel); } - /* -- save archive -- */ - static void save_file_response_cb (GtkWidget *w, gint response, @@ -458,7 +444,6 @@ save_file_response_cb (GtkWidget *w, g_free (path); } - void activate_action_save_as (GtkAction *action, gpointer callback_data) @@ -500,7 +485,6 @@ activate_action_save_as (GtkAction *action, g_free (archive_name); } - void activate_action_test_archive (GtkAction *action, gpointer data) @@ -510,7 +494,6 @@ activate_action_test_archive (GtkAction *action, fr_window_archive_test (window); } - void activate_action_properties (GtkAction *action, gpointer data) @@ -520,7 +503,6 @@ activate_action_properties (GtkAction *action, dlg_prop (window); } - void activate_action_close (GtkAction *action, gpointer data) @@ -530,7 +512,6 @@ activate_action_close (GtkAction *action, fr_window_close (window); } - void activate_action_add_files (GtkAction *action, gpointer data) @@ -538,7 +519,6 @@ activate_action_add_files (GtkAction *action, add_files_cb (NULL, data); } - void activate_action_add_folder (GtkAction *action, gpointer data) @@ -546,7 +526,6 @@ activate_action_add_folder (GtkAction *action, add_folder_cb (NULL, data); } - void activate_action_extract (GtkAction *action, gpointer data) @@ -554,7 +533,6 @@ activate_action_extract (GtkAction *action, dlg_extract (NULL, data); } - void activate_action_extract_folder_from_sidebar (GtkAction *action, gpointer data) @@ -562,7 +540,6 @@ activate_action_extract_folder_from_sidebar (GtkAction *action, dlg_extract_folder_from_sidebar (NULL, data); } - void activate_action_copy (GtkAction *action, gpointer data) @@ -570,7 +547,6 @@ activate_action_copy (GtkAction *action, fr_window_copy_selection ((FrWindow*) data, FALSE); } - void activate_action_cut (GtkAction *action, gpointer data) @@ -578,7 +554,6 @@ activate_action_cut (GtkAction *action, fr_window_cut_selection ((FrWindow*) data, FALSE); } - void activate_action_paste (GtkAction *action, gpointer data) @@ -586,7 +561,6 @@ activate_action_paste (GtkAction *action, fr_window_paste_selection ((FrWindow*) data, FALSE); } - void activate_action_rename (GtkAction *action, gpointer data) @@ -594,7 +568,6 @@ activate_action_rename (GtkAction *action, fr_window_rename_selection ((FrWindow*) data, FALSE); } - void activate_action_delete (GtkAction *action, gpointer data) @@ -602,7 +575,6 @@ activate_action_delete (GtkAction *action, dlg_delete (NULL, data); } - void activate_action_copy_folder_from_sidebar (GtkAction *action, gpointer data) @@ -610,7 +582,6 @@ activate_action_copy_folder_from_sidebar (GtkAction *action, fr_window_copy_selection ((FrWindow*) data, TRUE); } - void activate_action_cut_folder_from_sidebar (GtkAction *action, gpointer data) @@ -618,7 +589,6 @@ activate_action_cut_folder_from_sidebar (GtkAction *action, fr_window_cut_selection ((FrWindow*) data, TRUE); } - void activate_action_paste_folder_from_sidebar (GtkAction *action, gpointer data) @@ -626,7 +596,6 @@ activate_action_paste_folder_from_sidebar (GtkAction *action, fr_window_paste_selection ((FrWindow*) data, TRUE); } - void activate_action_rename_folder_from_sidebar (GtkAction *action, gpointer data) @@ -634,7 +603,6 @@ activate_action_rename_folder_from_sidebar (GtkAction *action, fr_window_rename_selection ((FrWindow*) data, TRUE); } - void activate_action_delete_folder_from_sidebar (GtkAction *action, gpointer data) @@ -642,7 +610,6 @@ activate_action_delete_folder_from_sidebar (GtkAction *action, dlg_delete_from_sidebar (NULL, data); } - void activate_action_find (GtkAction *action, gpointer data) @@ -652,7 +619,6 @@ activate_action_find (GtkAction *action, fr_window_find (window); } - void activate_action_select_all (GtkAction *action, gpointer data) @@ -662,7 +628,6 @@ activate_action_select_all (GtkAction *action, fr_window_select_all (window); } - void activate_action_deselect_all (GtkAction *action, gpointer data) @@ -672,7 +637,6 @@ activate_action_deselect_all (GtkAction *action, fr_window_unselect_all (window); } - void activate_action_open_with (GtkAction *action, gpointer data) @@ -680,7 +644,6 @@ activate_action_open_with (GtkAction *action, open_with_cb (NULL, (FrWindow*) data); } - void activate_action_view_or_open (GtkAction *action, gpointer data) @@ -695,7 +658,6 @@ activate_action_view_or_open (GtkAction *action, path_list_free (file_list); } - void activate_action_open_folder (GtkAction *action, gpointer data) @@ -704,7 +666,6 @@ activate_action_open_folder (GtkAction *action, fr_window_current_folder_activated (window, FALSE); } - void activate_action_open_folder_from_sidebar (GtkAction *action, gpointer data) @@ -713,7 +674,6 @@ activate_action_open_folder_from_sidebar (GtkAction *action, fr_window_current_folder_activated (window, TRUE); } - void activate_action_password (GtkAction *action, gpointer data) @@ -721,7 +681,6 @@ activate_action_password (GtkAction *action, dlg_password (NULL, (FrWindow*) data); } - void activate_action_view_toolbar (GtkAction *action, gpointer data) @@ -733,7 +692,6 @@ activate_action_view_toolbar (GtkAction *action, g_object_unref (settings); } - void activate_action_view_statusbar (GtkAction *action, gpointer data) @@ -745,7 +703,6 @@ activate_action_view_statusbar (GtkAction *action, g_object_unref (settings); } - void activate_action_view_folders (GtkAction *action, gpointer data) @@ -757,7 +714,6 @@ activate_action_view_folders (GtkAction *action, g_object_unref (settings); } - void activate_action_stop (GtkAction *action, gpointer data) @@ -766,7 +722,6 @@ activate_action_stop (GtkAction *action, fr_window_stop (window); } - void activate_action_reload (GtkAction *action, gpointer data) @@ -776,7 +731,6 @@ activate_action_reload (GtkAction *action, fr_window_archive_reload (window); } - void activate_action_sort_reverse_order (GtkAction *action, gpointer data) @@ -786,7 +740,6 @@ activate_action_sort_reverse_order (GtkAction *action, fr_window_set_sort_type (window, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) ? GTK_SORT_DESCENDING : GTK_SORT_ASCENDING); } - void activate_action_last_output (GtkAction *action, gpointer data) @@ -795,7 +748,6 @@ activate_action_last_output (GtkAction *action, fr_window_view_last_output (window, _("Last Output")); } - void activate_action_go_back (GtkAction *action, gpointer data) @@ -804,7 +756,6 @@ activate_action_go_back (GtkAction *action, fr_window_go_back (window); } - void activate_action_go_forward (GtkAction *action, gpointer data) @@ -813,7 +764,6 @@ activate_action_go_forward (GtkAction *action, fr_window_go_forward (window); } - void activate_action_go_up (GtkAction *action, gpointer data) @@ -822,7 +772,6 @@ activate_action_go_up (GtkAction *action, fr_window_go_up_one_level (window); } - void activate_action_go_home (GtkAction *action, gpointer data) @@ -831,7 +780,6 @@ activate_action_go_home (GtkAction *action, fr_window_go_to_location (window, "/", FALSE); } - void activate_action_manual (GtkAction *action, gpointer data) @@ -841,7 +789,6 @@ activate_action_manual (GtkAction *action, show_help_dialog (GTK_WINDOW (window) , NULL); } - #define ABOUT_GROUP "About" #define EMAILIFY(string) (g_strdelimit ((string), "%", '@')) diff --git a/src/actions.h b/src/actions.h index 106d9d6..f893503 100644 --- a/src/actions.h +++ b/src/actions.h @@ -78,5 +78,4 @@ void activate_action_go_home (GtkAction *action, gpointer data); void activate_action_manual (GtkAction *action, gpointer data); void activate_action_about (GtkAction *action, gpointer data); - #endif /* ACTIONS_H */ diff --git a/src/dlg-add-files.c b/src/dlg-add-files.c index c8430b3..3a3d60f 100644 --- a/src/dlg-add-files.c +++ b/src/dlg-add-files.c @@ -40,7 +40,6 @@ typedef struct { GtkWidget *add_if_newer_checkbutton; } DialogData; - static void open_file_destroy_cb (GtkWidget *file_sel, DialogData *data) @@ -49,7 +48,6 @@ open_file_destroy_cb (GtkWidget *file_sel, g_free (data); } - static int file_sel_response_cb (GtkWidget *widget, int response, @@ -77,7 +75,6 @@ file_sel_response_cb (GtkWidget *widget, g_free (uri); } - if ((response == GTK_RESPONSE_CANCEL) || (response == GTK_RESPONSE_DELETE_EVENT)) { gtk_widget_destroy (data->dialog); g_free (current_folder); @@ -132,7 +129,6 @@ file_sel_response_cb (GtkWidget *widget, return TRUE; } - /* create the "add" dialog. */ void add_files_cb (GtkWidget *widget, diff --git a/src/dlg-add-folder.c b/src/dlg-add-folder.c index ab613ed..eda59af 100644 --- a/src/dlg-add-folder.c +++ b/src/dlg-add-folder.c @@ -54,7 +54,6 @@ typedef struct { char *last_options; } DialogData; - static void open_file_destroy_cb (GtkWidget *widget, DialogData *data) @@ -64,7 +63,6 @@ open_file_destroy_cb (GtkWidget *widget, g_free (data); } - static gboolean utf8_only_spaces (const char *text) { @@ -82,10 +80,8 @@ utf8_only_spaces (const char *text) return TRUE; } - static void dlg_add_folder_save_last_options (DialogData *data); - static int file_sel_response_cb (GtkWidget *widget, int response, @@ -101,7 +97,6 @@ file_sel_response_cb (GtkWidget *widget, char *dest_dir; char *local_filename; - dlg_add_folder_save_last_options (data); if ((response == GTK_RESPONSE_CANCEL) || (response == GTK_RESPONSE_DELETE_EVENT)) { @@ -178,7 +173,6 @@ file_sel_response_cb (GtkWidget *widget, return TRUE; } - static int include_subfold_toggled_cb (GtkWidget *widget, gpointer callback_data) @@ -191,13 +185,11 @@ include_subfold_toggled_cb (GtkWidget *widget, return FALSE; } - static void load_options_cb (GtkWidget *w, DialogData *data); static void save_options_cb (GtkWidget *w, DialogData *data); static void clear_options_cb (GtkWidget *w, DialogData *data); static void dlg_add_folder_load_last_options (DialogData *data); - /* create the "add" dialog. */ void add_folder_cb (GtkWidget *widget, @@ -239,10 +231,8 @@ add_folder_cb (GtkWidget *widget, gtk_widget_show (data->dialog); } - /* load/save the dialog options */ - static void dlg_add_folder_save_last_used_options (DialogData *data, const char *options_path) @@ -251,7 +241,6 @@ dlg_add_folder_save_last_used_options (DialogData *data, data->last_options = g_strdup (file_name_from_path (options_path)); } - static void sync_widgets_with_options (DialogData *data, const char *base_dir, @@ -282,7 +271,6 @@ sync_widgets_with_options (DialogData *data, gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->exclude_symlinks), no_symlinks); } - static void clear_options_cb (GtkWidget *w, DialogData *data) @@ -298,7 +286,6 @@ clear_options_cb (GtkWidget *w, FALSE); } - static gboolean dlg_add_folder_load_options (DialogData *data, const char *name) @@ -365,7 +352,6 @@ dlg_add_folder_load_options (DialogData *data, return TRUE; } - static void dlg_add_folder_load_last_options (DialogData *data) { @@ -404,7 +390,6 @@ dlg_add_folder_load_last_options (DialogData *data) g_free (exclude_folders); } - static void get_options_from_widgets (DialogData *data, char **base_dir, @@ -435,7 +420,6 @@ get_options_from_widgets (DialogData *data, *exclude_folders = ""; } - static void dlg_add_folder_save_current_options (DialogData *data, GFile *options_file) @@ -479,7 +463,6 @@ dlg_add_folder_save_current_options (DialogData *data, g_free (filename); } - static void dlg_add_folder_save_last_options (DialogData *data) { @@ -515,7 +498,6 @@ dlg_add_folder_save_last_options (DialogData *data) g_free (filename); } - typedef struct { DialogData *data; GtkWidget *dialog; @@ -523,7 +505,6 @@ typedef struct { GtkTreeModel *aod_model; } LoadOptionsDialogData; - static void aod_destroy_cb (GtkWidget *widget, LoadOptionsDialogData *aod_data) @@ -531,7 +512,6 @@ aod_destroy_cb (GtkWidget *widget, g_free (aod_data); } - static void aod_apply_cb (GtkWidget *widget, gpointer callback_data) @@ -554,7 +534,6 @@ aod_apply_cb (GtkWidget *widget, gtk_widget_destroy (aod_data->dialog); } - static void aod_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, @@ -564,7 +543,6 @@ aod_activated_cb (GtkTreeView *tree_view, aod_apply_cb (NULL, callback_data); } - static void aod_update_option_list (LoadOptionsDialogData *aod_data) { @@ -619,7 +597,6 @@ aod_update_option_list (LoadOptionsDialogData *aod_data) g_object_unref (options_dir); } - static void aod_remove_cb (GtkWidget *widget, LoadOptionsDialogData *aod_data) @@ -650,7 +627,6 @@ aod_remove_cb (GtkWidget *widget, g_free (filename); } - static void load_options_cb (GtkWidget *w, DialogData *data) @@ -719,7 +695,6 @@ load_options_cb (GtkWidget *w, gtk_widget_show (aod_data->dialog); } - static void save_options_cb (GtkWidget *w, DialogData *data) diff --git a/src/dlg-ask-password.c b/src/dlg-ask-password.c index 7f628a2..b62ebaa 100644 --- a/src/dlg-ask-password.c +++ b/src/dlg-ask-password.c @@ -44,7 +44,6 @@ typedef struct { GtkWidget *pw_password_entry; } DialogData; - /* called when the main dialog is closed. */ static void destroy_cb (GtkWidget *widget, @@ -53,7 +52,6 @@ destroy_cb (GtkWidget *widget, g_free (data); } - static void ask_password__response_cb (GtkWidget *dialog, int response_id, @@ -86,7 +84,6 @@ ask_password__response_cb (GtkWidget *dialog, gtk_widget_destroy (data->dialog); } - static void dlg_ask_password__common (FrWindow *window, FrPasswordType pwd_type) @@ -147,14 +144,12 @@ dlg_ask_password__common (FrWindow *window, gtk_widget_show (data->dialog); } - void dlg_ask_password (FrWindow *window) { dlg_ask_password__common (window, FR_PASSWORD_TYPE_MAIN); } - void dlg_ask_password_for_paste_operation (FrWindow *window) { diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c index 9bd0ebd..2e36726 100644 --- a/src/dlg-batch-add.c +++ b/src/dlg-batch-add.c @@ -35,7 +35,6 @@ #include "preferences.h" #include "typedefs.h" - #define BAD_CHARS "/\\*" #define GET_ENTRY(x) (GTK_ENTRY (gtk_builder_get_object (data->builder, (x)))) #define GET_FILE_CHOOSER(x) (GTK_FILE_CHOOSER (gtk_builder_get_object (data->builder, (x)))) @@ -46,7 +45,6 @@ static gboolean has_password = FALSE; static gboolean can_encrypt_header = FALSE; - typedef struct { FrWindow *window; GSettings *settings; @@ -60,7 +58,6 @@ typedef struct { gboolean single_file; } DialogData; - static const char * get_ext (DialogData *data) { @@ -71,7 +68,6 @@ get_ext (DialogData *data) return mime_type_desc[data->supported_types[idx]].default_ext; } - /* called when the main dialog is closed. */ static void destroy_cb (GtkWidget *widget, @@ -81,7 +77,6 @@ destroy_cb (GtkWidget *widget, /*g_settings_set_boolean (data->settings, PREF_BATCH_ADD_OTHER_OPTIONS, data->add_clicked ? FALSE : gtk_expander_get_expanded (GTK_EXPANDER (GET_WIDGET ("a_other_options_expander"))));*/ g_settings_set_boolean (data->settings_general, PREF_GENERAL_ENCRYPT_HEADER, gtk_toggle_button_get_active (GET_TOGGLE_BUTTON ("a_encrypt_header_checkbutton"))); - if (! data->add_clicked) { fr_window_pop_message (data->window); fr_window_stop_batch (data->window); @@ -93,7 +88,6 @@ destroy_cb (GtkWidget *widget, g_free (data); } - static void set_archive_options (DialogData *data) { @@ -126,7 +120,6 @@ set_archive_options (DialogData *data) } } - static void help_clicked_cb (GtkWidget *widget, DialogData *data) @@ -134,7 +127,6 @@ help_clicked_cb (GtkWidget *widget, show_help_dialog (GET_WINDOW ("dialog"), "engrampa-fmgr-add"); } - static void add_clicked_cb (GtkWidget *widget, DialogData *data) @@ -359,7 +351,6 @@ add_clicked_cb (GtkWidget *widget, g_free (archive_file); } - static void update_sensitivity_for_mime_type (DialogData *data, const char *mime_type) @@ -396,7 +387,6 @@ update_sensitivity_for_mime_type (DialogData *data, } } - static void archive_type_combo_box_changed_cb (GtkComboBox *combo_box, DialogData *data) @@ -414,7 +404,6 @@ archive_type_combo_box_changed_cb (GtkComboBox *combo_box, update_sensitivity_for_mime_type (data, mime_type); } - static void update_archive_type_combo_box_from_ext (DialogData *data, const char *ext) @@ -436,7 +425,6 @@ update_archive_type_combo_box_from_ext (DialogData *data, gtk_combo_box_set_active (GTK_COMBO_BOX (data->archive_type_combo_box), idx); } - static void update_sensitivity (DialogData *data) { @@ -451,7 +439,6 @@ update_sensitivity (DialogData *data) gtk_widget_set_sensitive (GET_WIDGET ("a_encrypt_header_checkbutton"), can_encrypt_header ? has_password : FALSE); } - static void password_entry_notify_text_cb (GObject *object, GParamSpec *spec, @@ -460,7 +447,6 @@ password_entry_notify_text_cb (GObject *object, update_sensitivity ((DialogData *) user_data); } - static void volume_toggled_cb (GtkToggleButton *toggle_button, gpointer user_data) @@ -468,7 +454,6 @@ volume_toggled_cb (GtkToggleButton *toggle_button, update_sensitivity ((DialogData *) user_data); } - void dlg_batch_add_files (FrWindow *window, GList *file_list) @@ -498,7 +483,6 @@ dlg_batch_add_files (FrWindow *window, gtk_toggle_button_set_active (GET_TOGGLE_BUTTON ("a_encrypt_header_checkbutton"), g_settings_get_boolean (data->settings_general, PREF_GENERAL_ENCRYPT_HEADER)); gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("a_volume_spinbutton")), g_settings_get_int (data->settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE); - first_filename = (char*) file_list->data; parent = remove_level_from_path (first_filename); diff --git a/src/dlg-delete.c b/src/dlg-delete.c index 39994ae..18c8c8a 100644 --- a/src/dlg-delete.c +++ b/src/dlg-delete.c @@ -40,7 +40,6 @@ typedef struct { GtkWidget *d_files_entry; } DialogData; - /* called when the main dialog is closed. */ static void destroy_cb (GtkWidget *widget, @@ -50,7 +49,6 @@ destroy_cb (GtkWidget *widget, g_free (data); } - /* called when the "ok" button is pressed. */ static void ok_clicked_cb (GtkWidget *widget, @@ -92,7 +90,6 @@ ok_clicked_cb (GtkWidget *widget, path_list_free (file_list); } - static void entry_changed_cb (GtkWidget *widget, DialogData *data) @@ -101,7 +98,6 @@ entry_changed_cb (GtkWidget *widget, gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->d_files_radio), TRUE); } - static void dlg_delete__common (FrWindow *window, GList *selected_files) @@ -156,7 +152,6 @@ dlg_delete__common (FrWindow *window, gtk_widget_show (data->dialog); } - void dlg_delete (GtkWidget *widget, gpointer callback_data) @@ -166,7 +161,6 @@ dlg_delete (GtkWidget *widget, fr_window_get_file_list_selection (window, TRUE, NULL)); } - void dlg_delete_from_sidebar (GtkWidget *widget, gpointer callback_data) diff --git a/src/dlg-delete.h b/src/dlg-delete.h index 6ec9f5f..7f0b126 100644 --- a/src/dlg-delete.h +++ b/src/dlg-delete.h @@ -23,9 +23,7 @@ #ifndef DLG_DELETE_H #define DLG_DELETE_H - void dlg_delete (GtkWidget *widget, gpointer data); void dlg_delete_from_sidebar (GtkWidget *widget, gpointer data); - #endif /* DLG_DELETE_H */ diff --git a/src/dlg-extract.c b/src/dlg-extract.c index 1621c3e..b85d23b 100644 --- a/src/dlg-extract.c +++ b/src/dlg-extract.c @@ -46,7 +46,6 @@ typedef struct { gboolean extract_clicked; } DialogData; - /* called when the main dialog is closed. */ static void destroy_cb (GtkWidget *widget, @@ -63,7 +62,6 @@ destroy_cb (GtkWidget *widget, g_free (data); } - static int extract_cb (GtkWidget *w, DialogData *data) @@ -244,7 +242,6 @@ extract_cb (GtkWidget *w, return TRUE; } - static int file_sel_response_cb (GtkWidget *widget, int response, @@ -266,7 +263,6 @@ file_sel_response_cb (GtkWidget *widget, return FALSE; } - static void files_entry_changed_cb (GtkWidget *widget, DialogData *data) @@ -275,7 +271,6 @@ files_entry_changed_cb (GtkWidget *widget, gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("file_pattern_radiobutton")), TRUE); } - static void overwrite_toggled_cb (GtkToggleButton *button, DialogData *data) @@ -285,7 +280,6 @@ overwrite_toggled_cb (GtkToggleButton *button, gtk_widget_set_sensitive (GET_WIDGET ("not_newer_checkbutton"), active); } - static void dlg_extract__common (FrWindow *window, GList *selected_files, @@ -339,7 +333,6 @@ dlg_extract__common (FrWindow *window, gtk_widget_show (data->dialog); } - void dlg_extract (GtkWidget *widget, gpointer callback_data) @@ -352,7 +345,6 @@ dlg_extract (GtkWidget *widget, dlg_extract__common (window, files, base_dir); } - void dlg_extract_folder_from_sidebar (GtkWidget *widget, gpointer callback_data) diff --git a/src/dlg-new.c b/src/dlg-new.c index 8b78561..604167c 100644 --- a/src/dlg-new.c +++ b/src/dlg-new.c @@ -31,12 +31,10 @@ #include "fr-init.h" #include "preferences.h" - #define GET_WIDGET(x) (GTK_WIDGET (gtk_builder_get_object (builder, (x)))) #define DEFAULT_EXTENSION ".tar.gz" #define MEGABYTE (1024.0 * 1024.0) - /* called when the main dialog is closed. */ static void destroy_cb (GtkWidget *widget, @@ -45,7 +43,6 @@ destroy_cb (GtkWidget *widget, g_free (data); } - static void update_sensitivity (DlgNewData *data) { @@ -54,7 +51,6 @@ update_sensitivity (DlgNewData *data) gtk_widget_set_sensitive (data->n_volume_spinbutton, ! data->can_create_volumes || gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->n_volume_checkbutton))); } - static void update_sensitivity_for_ext (DlgNewData *data, const char *ext) @@ -95,7 +91,6 @@ update_sensitivity_for_ext (DlgNewData *data, update_sensitivity (data); } - static int get_archive_type (DlgNewData *data) { @@ -121,7 +116,6 @@ get_archive_type (DlgNewData *data) return get_mime_type_index (get_mime_type_from_extension (ext)); } - /* FIXME static void archive_type_combo_box_changed_cb (GtkComboBox *combo_box, @@ -166,7 +160,6 @@ archive_type_combo_box_changed_cb (GtkComboBox *combo_box, } */ - static void password_entry_changed_cb (GtkEditable *editable, gpointer user_data) @@ -174,7 +167,6 @@ password_entry_changed_cb (GtkEditable *editable, update_sensitivity ((DlgNewData *) user_data); } - static void volume_toggled_cb (GtkToggleButton *toggle_button, gpointer user_data) @@ -182,7 +174,6 @@ volume_toggled_cb (GtkToggleButton *toggle_button, update_sensitivity ((DlgNewData *) user_data); } - static void format_chooser_selection_changed_cb (EggFileFormatChooser *format_chooser, DlgNewData *data) @@ -227,7 +218,6 @@ format_chooser_selection_changed_cb (EggFileFormatChooser *format_chooser, } } - static char * get_icon_name_for_type (const char *mime_type) { @@ -250,7 +240,6 @@ get_icon_name_for_type (const char *mime_type) return name; } - static void options_expander_unmap_cb (GtkWidget *widget, gpointer user_data) @@ -258,7 +247,6 @@ options_expander_unmap_cb (GtkWidget *widget, egg_file_format_chooser_emit_size_changed ((EggFileFormatChooser *) user_data); } - static DlgNewData * dlg_new_archive (FrWindow *window, int *supported_types, @@ -380,7 +368,6 @@ dlg_new_archive (FrWindow *window, return data; } - DlgNewData * dlg_new (FrWindow *window) { @@ -392,7 +379,6 @@ dlg_new (FrWindow *window) return data; } - DlgNewData * dlg_save_as (FrWindow *window, const char *default_name) @@ -405,7 +391,6 @@ dlg_save_as (FrWindow *window, return data; } - const char * dlg_new_data_get_password (DlgNewData *data) { @@ -422,7 +407,6 @@ dlg_new_data_get_password (DlgNewData *data) return password; } - gboolean dlg_new_data_get_encrypt_header (DlgNewData *data) { @@ -446,7 +430,6 @@ dlg_new_data_get_encrypt_header (DlgNewData *data) return encrypt_header; } - int dlg_new_data_get_volume_size (DlgNewData *data) { diff --git a/src/dlg-new.h b/src/dlg-new.h index f4e0424..3f9f6d5 100644 --- a/src/dlg-new.h +++ b/src/dlg-new.h @@ -27,7 +27,6 @@ #include "eggfileformatchooser.h" #include "fr-window.h" - typedef struct { FrWindow *window; int *supported_types; @@ -48,7 +47,6 @@ typedef struct { EggFileFormatChooser *format_chooser; } DlgNewData; - DlgNewData * dlg_new (FrWindow *window); DlgNewData * dlg_save_as (FrWindow *window, const char *default_name); diff --git a/src/dlg-open-with.c b/src/dlg-open-with.c index ad6d835..0f22c47 100644 --- a/src/dlg-open-with.c +++ b/src/dlg-open-with.c @@ -31,13 +31,11 @@ #include "fr-window.h" #include "dlg-open-with.h" - typedef struct { FrWindow *window; GList *file_list; } OpenData; - static void app_chooser_response_cb (GtkDialog *dialog, int response_id, @@ -68,7 +66,6 @@ app_chooser_response_cb (GtkDialog *dialog, } } - void dlg_open_with (FrWindow *window, GList *file_list) @@ -92,7 +89,6 @@ dlg_open_with (FrWindow *window, gtk_widget_show (app_chooser); } - void open_with_cb (GtkWidget *widget, void *callback_data) diff --git a/src/dlg-package-installer.c b/src/dlg-package-installer.c index 0b18441..1873cbe 100644 --- a/src/dlg-package-installer.c +++ b/src/dlg-package-installer.c @@ -29,7 +29,6 @@ #include "gtk-utils.h" #include "fr-init.h" - typedef struct { FrWindow *window; FrArchive *archive; @@ -37,7 +36,6 @@ typedef struct { const char *packages; } InstallerData; - static void installer_data_free (InstallerData *idata) { @@ -46,7 +44,6 @@ installer_data_free (InstallerData *idata) g_free (idata); } - static void package_installer_terminated (InstallerData *idata, FrProcErrorType error_type, @@ -75,10 +72,8 @@ package_installer_terminated (InstallerData *idata, installer_data_free (idata); } - #ifdef ENABLE_PACKAGEKIT - static void packagekit_install_package_names_ready_cb (GObject *source_object, GAsyncResult *res, @@ -119,7 +114,6 @@ packagekit_install_package_names_ready_cb (GObject *source_object, g_object_unref (proxy); } - static char ** get_packages_real_names (char **names) { @@ -152,7 +146,6 @@ get_packages_real_names (char **names) return real_names; } - static void install_packages (InstallerData *idata) { @@ -226,7 +219,6 @@ install_packages (InstallerData *idata) } } - static void confirm_search_dialog_response_cb (GtkDialog *dialog, int response_id, @@ -268,7 +260,6 @@ create_button (const char *icon_name, #endif /* ENABLE_PACKAGEKIT */ - void dlg_package_installer (FrWindow *window, FrArchive *archive, diff --git a/src/dlg-password.c b/src/dlg-password.c index 02b8afa..f0468e5 100644 --- a/src/dlg-password.c +++ b/src/dlg-password.c @@ -37,7 +37,6 @@ typedef struct { GtkWidget *pw_encrypt_header_checkbutton; } DialogData; - /* called when the main dialog is closed. */ static void destroy_cb (GtkWidget *widget, @@ -46,7 +45,6 @@ destroy_cb (GtkWidget *widget, g_free (data); } - static void response_cb (GtkWidget *dialog, int response_id, @@ -78,7 +76,6 @@ response_cb (GtkWidget *dialog, gtk_widget_destroy (data->dialog); } - void dlg_password (GtkWidget *widget, gpointer callback_data) diff --git a/src/dlg-prop.c b/src/dlg-prop.c index 37376ad..cb8ed87 100644 --- a/src/dlg-prop.c +++ b/src/dlg-prop.c @@ -36,7 +36,6 @@ typedef struct { GtkWidget *dialog; } DialogData; - /* called when the main dialog is closed. */ static void destroy_cb (GtkWidget *widget, @@ -45,7 +44,6 @@ destroy_cb (GtkWidget *widget, g_free (data); } - static int help_cb (GtkWidget *w, DialogData *data) @@ -54,7 +52,6 @@ help_cb (GtkWidget *w, return TRUE; } - void dlg_prop (FrWindow *window) { diff --git a/src/dlg-update.c b/src/dlg-update.c index 2ceb675..be3a21d 100644 --- a/src/dlg-update.c +++ b/src/dlg-update.c @@ -58,7 +58,6 @@ typedef struct { GtkTreeModel *list_model; } DialogData; - /* called when the main dialog is closed. */ static void dlg_update__destroy_cb (GtkWidget *widget, @@ -70,7 +69,6 @@ dlg_update__destroy_cb (GtkWidget *widget, g_free (data); } - static GList* get_selected_files (DialogData *data) { @@ -95,7 +93,6 @@ get_selected_files (DialogData *data) return g_list_reverse (selection); } - static void update_cb (GtkWidget *widget, gpointer callback_data) @@ -117,7 +114,6 @@ update_cb (GtkWidget *widget, g_list_free (selection); } - static void update_file_list (DialogData *data) { @@ -234,7 +230,6 @@ update_file_list (DialogData *data) } } - static int n_selected (DialogData *data) { @@ -254,7 +249,6 @@ n_selected (DialogData *data) return n; } - static void is_selected_toggled (GtkCellRendererToggle *cell, char *path_string, @@ -275,7 +269,6 @@ is_selected_toggled (GtkCellRendererToggle *cell, gtk_widget_set_sensitive (data->update_files_ok_button, n_selected (data) > 0); } - gpointer dlg_update (FrWindow *window) { @@ -369,7 +362,6 @@ dlg_update (FrWindow *window) return data; } - void dlg_update_add_file (gpointer dialog, OpenFile *file) diff --git a/src/egg-macros.h b/src/egg-macros.h index 6e56e2e..5dc4d2e 100644 --- a/src/egg-macros.h +++ b/src/egg-macros.h @@ -88,7 +88,6 @@ type_as_function ## _get_type (void) \ parent_type, parent_type_macro) \ g_type_register_static (parent_type_macro, #type, &object_info, 0) - #define EGG_DEFINE_BOXED_TYPE(TN, t_n) \ EGG_DEFINE_BOXED_TYPE_WITH_CODE(TN, t_n, {}); diff --git a/src/eggtreemultidnd.c b/src/eggtreemultidnd.c index 87ad555..720c352 100644 --- a/src/eggtreemultidnd.c +++ b/src/eggtreemultidnd.c @@ -24,7 +24,6 @@ * Boston, MA 02110-1301, USA. */ - #include <string.h> #include <gtk/gtk.h> #include "eggtreemultidnd.h" @@ -48,7 +47,6 @@ typedef struct gboolean pending_event; } EggTreeMultiDndData; - GType egg_tree_multi_drag_source_get_type (void) { @@ -79,7 +77,6 @@ egg_tree_multi_drag_source_get_type (void) return our_type; } - /** * egg_tree_multi_drag_source_row_draggable: * @drag_source: a #EggTreeMultiDragSource @@ -107,7 +104,6 @@ egg_tree_multi_drag_source_row_draggable (EggTreeMultiDragSource *drag_source, return TRUE; } - /** * egg_tree_multi_drag_source_drag_data_delete: * @drag_source: a #EggTreeMultiDragSource @@ -134,7 +130,6 @@ egg_tree_multi_drag_source_drag_data_delete (EggTreeMultiDragSource *drag_source return (* iface->drag_data_delete) (drag_source, path_list); } - /** * egg_tree_multi_drag_source_drag_data_get: * @drag_source: a #EggTreeMultiDragSource @@ -164,7 +159,6 @@ egg_tree_multi_drag_source_drag_data_get (EggTreeMultiDragSource *drag_source, return (* iface->drag_data_get) (drag_source, context, selection_data, path_list); } - static void stop_drag_check (GtkWidget *widget) { @@ -190,7 +184,6 @@ stop_drag_check (GtkWidget *widget) } } - static gboolean egg_tree_multi_drag_button_release_event (GtkWidget *widget, GdkEventButton *event, @@ -209,7 +202,6 @@ egg_tree_multi_drag_button_release_event (GtkWidget *widget, return FALSE; } - static void selection_foreach (GtkTreeModel *model, GtkTreePath *path, @@ -223,7 +215,6 @@ selection_foreach (GtkTreeModel *model, *list_ptr = g_list_prepend (*list_ptr, gtk_tree_row_reference_new (model, path)); } - static void path_list_free (GList *path_list) { @@ -231,7 +222,6 @@ path_list_free (GList *path_list) g_list_free (path_list); } - static void set_context_data (GdkDragContext *context, GList *path_list) @@ -242,7 +232,6 @@ set_context_data (GdkDragContext *context, (GDestroyNotify) path_list_free); } - static GList * get_context_data (GdkDragContext *context) { @@ -250,7 +239,6 @@ get_context_data (GdkDragContext *context) "egg-tree-view-multi-source-row"); } - static gboolean egg_tree_multi_drag_drag_data_get (GtkWidget *widget, GdkDragContext *context, @@ -285,7 +273,6 @@ egg_tree_multi_drag_drag_data_get (GtkWidget *widget, path_list); } - static gboolean egg_tree_multi_drag_motion_event (GtkWidget *widget, GdkEventMotion *event, @@ -364,7 +351,6 @@ egg_tree_multi_drag_motion_event (GtkWidget *widget, return TRUE; } - static gboolean egg_tree_multi_drag_button_press_event (GtkWidget *widget, GdkEventButton *event, @@ -471,7 +457,6 @@ egg_tree_multi_drag_button_press_event (GtkWidget *widget, return FALSE; } - void egg_tree_multi_drag_add_drag_support (GtkTreeView *tree_view) { diff --git a/src/eggtreemultidnd.h b/src/eggtreemultidnd.h index be817be..c930b37 100644 --- a/src/eggtreemultidnd.h +++ b/src/eggtreemultidnd.h @@ -59,7 +59,6 @@ gboolean egg_tree_multi_drag_source_row_draggable (EggTreeMultiDragSource *dr gboolean egg_tree_multi_drag_source_drag_data_delete (EggTreeMultiDragSource *drag_source, GList *path_list); - /* Fills in selection_data with type selection_data->target based on the row * denoted by path, returns TRUE if it does anything */ diff --git a/src/file-data.c b/src/file-data.c index 911a5e9..944844d 100644 --- a/src/file-data.c +++ b/src/file-data.c @@ -27,7 +27,6 @@ #include "file-utils.h" #include "file-data.h" - FileData * file_data_new (void) { @@ -41,7 +40,6 @@ file_data_new (void) return fdata; } - void file_data_free (FileData *fdata) { @@ -58,7 +56,6 @@ file_data_free (FileData *fdata) g_free (fdata); } - FileData * file_data_copy (FileData *src) { @@ -87,7 +84,6 @@ file_data_copy (FileData *src) return fdata; } - GType file_data_get_type (void) { @@ -99,7 +95,6 @@ file_data_get_type (void) return type; } - void file_data_update_content_type (FileData *fdata) { @@ -109,14 +104,12 @@ file_data_update_content_type (FileData *fdata) fdata->content_type = get_static_string (g_content_type_guess (fdata->full_path, NULL, 0, NULL)); } - gboolean file_data_is_dir (FileData *fdata) { return fdata->dir || fdata->list_dir; } - void file_data_set_list_name (FileData *fdata, const char *value) @@ -131,7 +124,6 @@ file_data_set_list_name (FileData *fdata, fdata->sort_key = NULL; } - int file_data_compare_by_path (gconstpointer a, gconstpointer b) @@ -142,7 +134,6 @@ file_data_compare_by_path (gconstpointer a, return strcmp (data_a->full_path, data_b->full_path); } - int find_path_in_file_data_array (GPtrArray *array, const char *path) diff --git a/src/file-utils.c b/src/file-utils.c index a967cb4..04f6381 100644 --- a/src/file-utils.c +++ b/src/file-utils.c @@ -42,10 +42,8 @@ #include "glib-utils.h" #include "fr-init.h" - #define SPECIAL_DIR(x) ((strcmp ((x), "..") == 0) || (strcmp ((x), ".") == 0)) - gboolean uri_exists (const char *uri) { @@ -62,7 +60,6 @@ uri_exists (const char *uri) return exists; } - static gboolean uri_is_filetype (const char *uri, GFileType file_type) @@ -94,21 +91,18 @@ uri_is_filetype (const char *uri, return result; } - gboolean uri_is_file (const char *uri) { return uri_is_filetype (uri, G_FILE_TYPE_REGULAR); } - gboolean uri_is_dir (const char *uri) { return uri_is_filetype (uri, G_FILE_TYPE_DIRECTORY); } - gboolean path_is_dir (const char *path) { @@ -128,7 +122,6 @@ uri_is_local (const char *uri) return strncmp (uri, "file://", 7) == 0; } - gboolean dir_is_empty (const char *uri) { @@ -170,7 +163,6 @@ dir_is_empty (const char *uri) return (n == 0); } - gboolean dir_contains_one_object (const char *uri) { @@ -224,7 +216,6 @@ dir_contains_one_object (const char *uri) return (n == 1); } - char * get_dir_content_if_unique (const char *uri) { @@ -286,7 +277,6 @@ get_dir_content_if_unique (const char *uri) return content_uri; } - /* Check whether the dirname is contained in filename */ gboolean path_in_path (const char *dirname, @@ -318,7 +308,6 @@ path_in_path (const char *dirname, && (filename[separator_position] == '/')); } - goffset get_file_size (const char *uri) { @@ -346,7 +335,6 @@ get_file_size (const char *uri) return size; } - goffset get_file_size_for_path (const char *path) { @@ -360,7 +348,6 @@ get_file_size_for_path (const char *path) return result; } - static time_t get_file_time_type (const char *uri, const char *type) @@ -390,14 +377,12 @@ get_file_time_type (const char *uri, return result; } - time_t get_file_mtime (const char *uri) { return get_file_time_type (uri, G_FILE_ATTRIBUTE_TIME_MODIFIED); } - time_t get_file_mtime_for_path (const char *path) { @@ -411,14 +396,12 @@ get_file_mtime_for_path (const char *path) return result; } - time_t get_file_ctime (const char *uri) { return get_file_time_type (uri, G_FILE_ATTRIBUTE_TIME_CREATED); } - gboolean file_is_hidden (const gchar *name) { @@ -429,7 +412,6 @@ file_is_hidden (const gchar *name) return TRUE; } - /* like g_path_get_basename but does not warn about NULL and does not * alloc a new string. */ const gchar* file_name_from_path(const gchar *file_name) @@ -455,7 +437,6 @@ const gchar* file_name_from_path(const gchar *file_name) return base + 1; } - char * dir_name_from_path (const gchar *path) { @@ -479,7 +460,6 @@ dir_name_from_path (const gchar *path) return g_strndup (path + base + 1, last_char - base); } - gchar * remove_level_from_path (const gchar *path) { @@ -503,7 +483,6 @@ remove_level_from_path (const gchar *path) return new_path; } - char * remove_ending_separator (const char *path) { @@ -519,7 +498,6 @@ remove_ending_separator (const char *path) return g_strndup (path, copy_len); } - char * build_uri (const char *base, ...) { @@ -540,7 +518,6 @@ build_uri (const char *base, ...) return g_string_free (uri, FALSE); } - gchar * remove_extension_from_path (const gchar *path) { @@ -566,7 +543,6 @@ remove_extension_from_path (const gchar *path) return new_path; } - gboolean make_directory_tree (GFile *dir, mode_t mode, @@ -603,7 +579,6 @@ make_directory_tree (GFile *dir, return success; } - gboolean ensure_dir_exists (const char *uri, mode_t mode, @@ -629,7 +604,6 @@ ensure_dir_exists (const char *uri, return TRUE; } - gboolean make_directory_tree_from_path (const char *path, mode_t mode, @@ -645,7 +619,6 @@ make_directory_tree_from_path (const char *path, return result; } - const char * get_file_extension (const char *filename) { @@ -676,7 +649,6 @@ get_file_extension (const char *filename) return ext; } - gboolean file_extension_is (const char *filename, const char *ext) @@ -691,7 +663,6 @@ file_extension_is (const char *filename, return strcasecmp (filename + filename_l - ext_l, ext) == 0; } - gboolean is_mime_type (const char *mime_type, const char *pattern) @@ -699,7 +670,6 @@ is_mime_type (const char *mime_type, return (strcasecmp (mime_type, pattern) == 0); } - const char* get_file_mime_type (const char *uri, gboolean fast_file_type) @@ -729,7 +699,6 @@ get_file_mime_type (const char *uri, return result; } - const char* get_file_mime_type_for_path (const char *filename, gboolean fast_file_type) @@ -744,7 +713,6 @@ get_file_mime_type_for_path (const char *filename, return mime_type; } - void path_list_free (GList *path_list) { @@ -753,7 +721,6 @@ path_list_free (GList *path_list) g_list_free_full (path_list, g_free); } - GList * path_list_dup (GList *path_list) { @@ -766,7 +733,6 @@ path_list_dup (GList *path_list) return g_list_reverse (new_list); } - guint64 get_dest_free_space (const char *path) { @@ -790,7 +756,6 @@ get_dest_free_space (const char *path) return freespace; } - static gboolean delete_directory_recursive (GFile *dir, GError **error) @@ -841,7 +806,6 @@ delete_directory_recursive (GFile *dir, return ! error_occurred; } - gboolean remove_directory (const char *uri) { @@ -860,7 +824,6 @@ remove_directory (const char *uri) return result; } - gboolean remove_local_directory (const char *path) { @@ -877,10 +840,8 @@ remove_local_directory (const char *path) return result; } - static const char *try_folder[] = { "cache", "~", "tmp", NULL }; - static char * ith_temp_folder_to_try (int n) { @@ -897,7 +858,6 @@ ith_temp_folder_to_try (int n) return g_strdup (folder); } - char * get_temp_work_dir (const char *parent_folder) { @@ -942,7 +902,6 @@ get_temp_work_dir (const char *parent_folder) return result; } - gboolean is_temp_work_dir (const char *dir) { @@ -967,7 +926,6 @@ is_temp_work_dir (const char *dir) return FALSE; } - gboolean is_temp_dir (const char *dir) { @@ -981,10 +939,8 @@ is_temp_dir (const char *dir) return is_temp_work_dir (dir); } - /* file list utils */ - gboolean file_list__match_pattern (const char *line, const char *pattern) @@ -1018,7 +974,6 @@ file_list__match_pattern (const char *line, return (*p == 0); } - int file_list__get_index_from_pattern (const char *line, const char *pattern) @@ -1039,7 +994,6 @@ file_list__get_index_from_pattern (const char *line, return -1; } - char* file_list__get_next_field (const char *line, int start_from, @@ -1069,7 +1023,6 @@ file_list__get_next_field (const char *line, return g_strndup (f_start, f_end - f_start); } - char* file_list__get_prev_field (const char *line, int start_from, @@ -1097,7 +1050,6 @@ file_list__get_prev_field (const char *line, return g_strndup (f_start + 1, f_end - f_start); } - gboolean check_permissions (const char *uri, int mode) @@ -1113,7 +1065,6 @@ check_permissions (const char *uri, return result; } - gboolean check_file_permissions (GFile *file, int mode) @@ -1156,7 +1107,6 @@ check_file_permissions (GFile *file, return result; } - gboolean is_program_in_path (const char *filename) { @@ -1183,7 +1133,6 @@ is_program_in_path (const char *filename) return result; } - gboolean is_program_available (const char *filename, gboolean check) @@ -1191,7 +1140,6 @@ is_program_available (const char *filename, return ! check || is_program_in_path (filename); } - const char * get_home_uri (void) { @@ -1201,7 +1149,6 @@ get_home_uri (void) return home_uri; } - char * get_home_relative_uri (const char *partial_uri) { @@ -1211,7 +1158,6 @@ get_home_relative_uri (const char *partial_uri) NULL); } - GFile * get_home_relative_file (const char *partial_uri) { @@ -1225,7 +1171,6 @@ get_home_relative_file (const char *partial_uri) return file; } - GFile * get_user_config_subdirectory (const char *child_name, gboolean create_child) @@ -1248,7 +1193,6 @@ get_user_config_subdirectory (const char *child_name, return file; } - const char * remove_host_from_uri (const char *uri) { @@ -1269,7 +1213,6 @@ remove_host_from_uri (const char *uri) return sep; } - char * get_uri_host (const char *uri) { @@ -1284,7 +1227,6 @@ get_uri_host (const char *uri) return g_strndup (uri, (idx - uri)); } - char * get_uri_root (const char *uri) { @@ -1300,7 +1242,6 @@ get_uri_root (const char *uri) return root; } - int uricmp (const char *uri1, const char *uri2) @@ -1308,7 +1249,6 @@ uricmp (const char *uri1, return strcmp_null_tolerant (uri1, uri2); } - char * get_alternative_uri (const char *folder, const char *name) @@ -1328,7 +1268,6 @@ get_alternative_uri (const char *folder, return new_uri; } - char * get_alternative_uri_for_uri (const char *uri) { @@ -1342,7 +1281,6 @@ get_alternative_uri_for_uri (const char *uri) return new_uri; } - GList * gio_file_list_dup (GList *l) { @@ -1352,7 +1290,6 @@ gio_file_list_dup (GList *l) return g_list_reverse (r); } - void gio_file_list_free (GList *l) { @@ -1362,7 +1299,6 @@ gio_file_list_free (GList *l) g_list_free (l); } - GList * gio_file_list_new_from_uri_list (GList *uris) { @@ -1372,7 +1308,6 @@ gio_file_list_new_from_uri_list (GList *uris) return g_list_reverse (r); } - void g_key_file_save (GKeyFile *key_file, GFile *file) diff --git a/src/fr-archive.c b/src/fr-archive.c index 3d53f58..301968f 100644 --- a/src/fr-archive.c +++ b/src/fr-archive.c @@ -50,10 +50,8 @@ #define NCARGS _POSIX_ARG_MAX #endif - /* -- DroppedItemsData -- */ - typedef struct { FrArchive *archive; GList *item_list; @@ -66,7 +64,6 @@ typedef struct { guint volume_size; } DroppedItemsData; - static DroppedItemsData * dropped_items_data_new (FrArchive *archive, GList *item_list, @@ -97,7 +94,6 @@ dropped_items_data_new (FrArchive *archive, return data; } - static void dropped_items_data_free (DroppedItemsData *data) { @@ -110,7 +106,6 @@ dropped_items_data_free (DroppedItemsData *data) g_free (data); } - struct _FrArchivePrivData { FakeLoadFunc fake_load_func; /* If returns TRUE, archives are not read when * fr_archive_load is invoked, used @@ -127,7 +122,6 @@ struct _FrArchivePrivData { gboolean extract_here; }; - typedef struct { FrArchive *archive; char *uri; @@ -144,7 +138,6 @@ typedef struct { guint volume_size; } XferData; - static void xfer_data_free (XferData *data) { @@ -160,14 +153,12 @@ xfer_data_free (XferData *data) g_free (data); } - #define MAX_CHUNK_LEN (NCARGS * 2 / 3) /* Max command line length */ #define NO_BACKUP_FILES (TRUE) #define NO_DOT_FILES (FALSE) #define IGNORE_CASE (FALSE) #define LIST_LENGTH_TO_USE_FILE 10 /* FIXME: find a good value */ - enum { START, DONE, @@ -185,7 +176,6 @@ static void fr_archive_class_init (FrArchiveClass *class); static void fr_archive_init (FrArchive *archive); static void fr_archive_finalize (GObject *object); - GType fr_archive_get_type (void) { @@ -214,7 +204,6 @@ fr_archive_get_type (void) return type; } - static void fr_archive_class_init (FrArchiveClass *class) { @@ -289,7 +278,6 @@ fr_archive_class_init (FrArchiveClass *class) G_TYPE_STRING); } - void fr_archive_stoppable (FrArchive *archive, gboolean stoppable) @@ -300,7 +288,6 @@ fr_archive_stoppable (FrArchive *archive, stoppable); } - void fr_archive_stop (FrArchive *archive) { @@ -313,7 +300,6 @@ fr_archive_stop (FrArchive *archive) g_cancellable_cancel (archive->priv->cancellable); } - void fr_archive_action_completed (FrArchive *archive, FrAction action, @@ -334,7 +320,6 @@ fr_archive_action_completed (FrArchive *archive, &archive->error); } - static gboolean archive_sticky_only_cb (FrProcess *process, FrArchive *archive) @@ -343,7 +328,6 @@ archive_sticky_only_cb (FrProcess *process, return TRUE; } - static void fr_archive_init (FrArchive *archive) { @@ -369,14 +353,12 @@ fr_archive_init (FrArchive *archive) archive); } - FrArchive * fr_archive_new (void) { return FR_ARCHIVE (g_object_new (FR_TYPE_ARCHIVE, NULL)); } - static GFile * get_local_copy_for_file (GFile *remote_file) { @@ -400,7 +382,6 @@ get_local_copy_for_file (GFile *remote_file) return local_copy; } - static void fr_archive_set_uri (FrArchive *archive, const char *uri) @@ -446,7 +427,6 @@ fr_archive_set_uri (FrArchive *archive, archive->local_copy = g_file_dup (archive->file); } - static void fr_archive_remove_temp_work_dir (FrArchive *archive) { @@ -457,7 +437,6 @@ fr_archive_remove_temp_work_dir (FrArchive *archive) archive->priv->temp_dir = NULL; } - static void fr_archive_finalize (GObject *object) { @@ -487,7 +466,6 @@ fr_archive_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - static const char * get_mime_type_from_content (GFile *file) { @@ -510,7 +488,6 @@ get_mime_type_from_content (GFile *file) return content_type; } - static const char * get_mime_type_from_magic_numbers (GFile *file) { @@ -591,7 +568,6 @@ get_mime_type_from_magic_numbers (GFile *file) return NULL; } - static const char * get_mime_type_from_filename (GFile *file) { @@ -608,7 +584,6 @@ get_mime_type_from_filename (GFile *file) return mime_type; } - static gboolean create_command_from_type (FrArchive *archive, const char *mime_type, @@ -634,7 +609,6 @@ create_command_from_type (FrArchive *archive, return (archive->command != NULL); } - static gboolean create_command_to_load_archive (FrArchive *archive, const char *mime_type) @@ -665,7 +639,6 @@ create_command_to_load_archive (FrArchive *archive, requested_capabilities); } - static gboolean create_command_to_create_archive (FrArchive *archive, const char *mime_type) @@ -685,7 +658,6 @@ create_command_to_create_archive (FrArchive *archive, requested_capabilities); } - static void action_started (FrCommand *command, FrAction action, @@ -701,10 +673,8 @@ action_started (FrCommand *command, action); } - /* -- copy_to_remote_location -- */ - static void fr_archive_copy_done (FrArchive *archive, FrAction action, @@ -720,7 +690,6 @@ fr_archive_copy_done (FrArchive *archive, fr_archive_action_completed (archive, action, error_type, error_details); } - static void copy_to_remote_location_done (GError *error, gpointer user_data) @@ -731,7 +700,6 @@ copy_to_remote_location_done (GError *error, xfer_data_free (xfer_data); } - static void copy_to_remote_location_progress (goffset current_file, goffset total_files, @@ -749,7 +717,6 @@ copy_to_remote_location_progress (goffset current_file, (double) current_num_bytes / total_num_bytes); } - static void copy_to_remote_location (FrArchive *archive, FrAction action) @@ -771,10 +738,8 @@ copy_to_remote_location (FrArchive *archive, xfer_data); } - /* -- copy_extracted_files_to_destination -- */ - static void move_here (FrArchive *archive) { @@ -842,7 +807,6 @@ move_here (FrArchive *archive) g_free (content_uri); } - static void copy_extracted_files_done (GError *error, gpointer user_data) @@ -864,7 +828,6 @@ copy_extracted_files_done (GError *error, fr_archive_copy_done (archive, FR_ACTION_EXTRACTING_FILES, error); } - static void copy_extracted_files_progress (goffset current_file, goffset total_files, @@ -882,7 +845,6 @@ copy_extracted_files_progress (goffset current_file, (double) current_file / (total_files + 1)); } - static void copy_extracted_files_to_destination (FrArchive *archive) { @@ -897,10 +859,8 @@ copy_extracted_files_to_destination (FrArchive *archive) archive); } - static void add_dropped_items (DroppedItemsData *data); - static void fr_archive_change_name (FrArchive *archive, const char *filename) @@ -921,7 +881,6 @@ fr_archive_change_name (FrArchive *archive, g_object_unref (parent); } - static void action_performed (FrCommand *command, FrAction action, @@ -1011,7 +970,6 @@ action_performed (FrCommand *command, error); } - static gboolean archive_progress_cb (FrCommand *command, double fraction, @@ -1024,7 +982,6 @@ archive_progress_cb (FrCommand *command, return TRUE; } - static gboolean archive_message_cb (FrCommand *command, const char *msg, @@ -1037,7 +994,6 @@ archive_message_cb (FrCommand *command, return TRUE; } - static gboolean archive_working_archive_cb (FrCommand *command, const char *archive_filename, @@ -1050,7 +1006,6 @@ archive_working_archive_cb (FrCommand *command, return TRUE; } - static void fr_archive_connect_to_command (FrArchive *archive) { @@ -1076,7 +1031,6 @@ fr_archive_connect_to_command (FrArchive *archive) archive); } - gboolean fr_archive_create (FrArchive *archive, const char *uri) @@ -1108,7 +1062,6 @@ fr_archive_create (FrArchive *archive, return TRUE; } - void fr_archive_set_fake_load_func (FrArchive *archive, FakeLoadFunc func, @@ -1118,7 +1071,6 @@ fr_archive_set_fake_load_func (FrArchive *archive, archive->priv->fake_load_data = data; } - gboolean fr_archive_fake_load (FrArchive *archive) { @@ -1128,10 +1080,8 @@ fr_archive_fake_load (FrArchive *archive) return FALSE; } - /* -- fr_archive_load -- */ - static void load_local_archive (FrArchive *archive, const char *password) @@ -1196,7 +1146,6 @@ load_local_archive (FrArchive *archive, fr_command_list (archive->command); } - static void copy_remote_file_done (GError *error, gpointer user_data) @@ -1210,7 +1159,6 @@ copy_remote_file_done (GError *error, xfer_data_free (xfer_data); } - static void copy_remote_file_progress (goffset current_file, goffset total_files, @@ -1228,7 +1176,6 @@ copy_remote_file_progress (goffset current_file, (double) current_num_bytes / total_num_bytes); } - static gboolean copy_remote_file_done_cb (gpointer user_data) { @@ -1239,7 +1186,6 @@ copy_remote_file_done_cb (gpointer user_data) return FALSE; } - static void copy_remote_file (FrArchive *archive, const char *password) @@ -1278,7 +1224,6 @@ copy_remote_file (FrArchive *archive, xfer_data); } - gboolean fr_archive_load (FrArchive *archive, const char *uri, @@ -1297,7 +1242,6 @@ fr_archive_load (FrArchive *archive, return TRUE; } - gboolean fr_archive_load_local (FrArchive *archive, const char *uri, @@ -1316,7 +1260,6 @@ fr_archive_load_local (FrArchive *archive, return TRUE; } - void fr_archive_reload (FrArchive *archive, const char *password) @@ -1334,10 +1277,8 @@ fr_archive_reload (FrArchive *archive, g_free (uri); } - /* -- add -- */ - static char * create_tmp_base_dir (const char *base_dir, const char *dest_path) @@ -1382,7 +1323,6 @@ create_tmp_base_dir (const char *base_dir, return temp_dir; } - static FileData * find_file_in_archive (FrArchive *archive, char *path) @@ -1398,10 +1338,8 @@ find_file_in_archive (FrArchive *archive, return NULL; } - static void delete_from_archive (FrArchive *archive, GList *file_list); - static GList * newer_files_only (FrArchive *archive, GList *file_list, @@ -1495,7 +1433,6 @@ save_list_to_temp_file (GList *file_list, return ! error_occurred; } - static GList * split_in_chunks (GList *file_list) { @@ -1530,7 +1467,6 @@ split_in_chunks (GList *file_list) return chunks; } - void fr_archive_add (FrArchive *archive, GList *file_list, @@ -1785,7 +1721,6 @@ fr_archive_add (FrArchive *archive, g_free (tmp_base_dir); } - static void fr_archive_add_local_files (FrArchive *archive, GList *file_list, @@ -1811,7 +1746,6 @@ fr_archive_add_local_files (FrArchive *archive, fr_process_start (archive->process); } - static void copy_remote_files_done (GError *error, gpointer user_data) @@ -1833,7 +1767,6 @@ copy_remote_files_done (GError *error, xfer_data_free (xfer_data); } - static void copy_remote_files_progress (goffset current_file, goffset total_files, @@ -1851,7 +1784,6 @@ copy_remote_files_progress (goffset current_file, (double) current_file / (total_files + 1)); } - static void copy_remote_files (FrArchive *archive, GList *file_list, @@ -1940,7 +1872,6 @@ copy_remote_files (FrArchive *archive, gio_file_list_free (destinations); } - static char * fr_archive_get_temp_work_dir (FrArchive *archive) { @@ -1949,7 +1880,6 @@ fr_archive_get_temp_work_dir (FrArchive *archive) return archive->priv->temp_dir; } - void fr_archive_add_files (FrArchive *archive, GList *file_list, @@ -1987,10 +1917,8 @@ fr_archive_add_files (FrArchive *archive, fr_archive_get_temp_work_dir (archive)); } - /* -- add with wildcard -- */ - typedef struct { FrArchive *archive; char *source_dir; @@ -2002,7 +1930,6 @@ typedef struct { guint volume_size; } AddWithWildcardData; - static void add_with_wildcard_data_free (AddWithWildcardData *aww_data) { @@ -2012,7 +1939,6 @@ add_with_wildcard_data_free (AddWithWildcardData *aww_data) g_free (aww_data); } - static void add_with_wildcard__step2 (GList *file_list, GList *dirs_list, @@ -2051,7 +1977,6 @@ add_with_wildcard__step2 (GList *file_list, add_with_wildcard_data_free (aww_data); } - void fr_archive_add_with_wildcard (FrArchive *archive, const char *include_files, @@ -2100,10 +2025,8 @@ fr_archive_add_with_wildcard (FrArchive *archive, aww_data); } - /* -- fr_archive_add_directory -- */ - typedef struct { FrArchive *archive; char *base_dir; @@ -2115,7 +2038,6 @@ typedef struct { guint volume_size; } AddDirectoryData; - static void add_directory_data_free (AddDirectoryData *ad_data) { @@ -2125,7 +2047,6 @@ add_directory_data_free (AddDirectoryData *ad_data) g_free (ad_data); } - static void add_directory__step2 (GList *file_list, GList *dir_list, @@ -2169,7 +2090,6 @@ add_directory__step2 (GList *file_list, add_directory_data_free (ad_data); } - void fr_archive_add_directory (FrArchive *archive, const char *directory, @@ -2209,7 +2129,6 @@ fr_archive_add_directory (FrArchive *archive, ad_data); } - void fr_archive_add_items (FrArchive *archive, GList *item_list, @@ -2248,10 +2167,8 @@ fr_archive_add_items (FrArchive *archive, ad_data); } - /* -- fr_archive_add_dropped_items -- */ - static gboolean all_files_in_same_dir (GList *list) { @@ -2288,7 +2205,6 @@ all_files_in_same_dir (GList *list) return same_dir; } - static void add_dropped_items (DroppedItemsData *data) { @@ -2427,7 +2343,6 @@ add_dropped_items (DroppedItemsData *data) data->item_list = NULL; } - void fr_archive_add_dropped_items (FrArchive *archive, GList *item_list, @@ -2479,10 +2394,8 @@ fr_archive_add_dropped_items (FrArchive *archive, add_dropped_items (archive->priv->dropped_items_data); } - /* -- remove -- */ - static gboolean file_is_in_subfolder_of (const char *filename, GList *folder_list) @@ -2508,7 +2421,6 @@ archive_type_has_issues_deleting_non_empty_folders (FrArchive *archive) return ! archive->command->propCanDeleteNonEmptyFolders; } - static void delete_from_archive (FrArchive *archive, GList *file_list) @@ -2616,7 +2528,6 @@ delete_from_archive (FrArchive *archive, g_list_free (tmp_file_list); } - void fr_archive_remove (FrArchive *archive, GList *file_list, @@ -2698,10 +2609,8 @@ fr_archive_remove (FrArchive *archive, g_free (tmp_archive_dir); } - /* -- extract -- */ - static void move_files_to_dir (FrArchive *archive, GList *file_list, @@ -2773,7 +2682,6 @@ move_files_to_dir (FrArchive *archive, g_list_free (list); } - static void move_files_in_chunks (FrArchive *archive, GList *file_list, @@ -2808,7 +2716,6 @@ move_files_in_chunks (FrArchive *archive, } } - static void extract_from_archive (FrArchive *archive, GList *file_list, @@ -2892,7 +2799,6 @@ extract_from_archive (FrArchive *archive, } } - static char* compute_base_path (const char *base_dir, const char *path, @@ -2936,7 +2842,6 @@ compute_base_path (const char *base_dir, return new_path; } - static GList* compute_list_base_path (const char *base_dir, GList *filtered, @@ -2983,7 +2888,6 @@ compute_list_base_path (const char *base_dir, return list_unique; } - static gboolean archive_type_has_issues_extracting_non_empty_folders (FrArchive *archive) { @@ -2992,7 +2896,6 @@ archive_type_has_issues_extracting_non_empty_folders (FrArchive *archive) return ! archive->command->propCanExtractNonEmptyFolders; } - static gboolean file_list_contains_files_in_this_dir (GList *file_list, const char *dirname) @@ -3009,7 +2912,6 @@ file_list_contains_files_in_this_dir (GList *file_list, return FALSE; } - static GList* remove_files_contained_in_this_dir (GList *file_list, GList *dir_pointer) @@ -3039,7 +2941,6 @@ remove_files_contained_in_this_dir (GList *file_list, return file_list; } - void fr_archive_extract_to_local (FrArchive *archive, GList *file_list, @@ -3246,7 +3147,6 @@ fr_archive_extract_to_local (FrArchive *archive, path_list_free (file_list); } - void fr_archive_extract (FrArchive *archive, GList *file_list, @@ -3291,7 +3191,6 @@ fr_archive_extract (FrArchive *archive, } } - static char * get_desired_destination_for_archive (GFile *file) { @@ -3327,7 +3226,6 @@ get_desired_destination_for_archive (GFile *file) return desired_destination; } - static char * get_extract_here_destination (GFile *file, GError **error) @@ -3366,7 +3264,6 @@ get_extract_here_destination (GFile *file, return destination; } - gboolean fr_archive_extract_here (FrArchive *archive, gboolean skip_older, @@ -3402,14 +3299,12 @@ fr_archive_extract_here (FrArchive *archive, return TRUE; } - const char * fr_archive_get_last_extraction_destination (FrArchive *archive) { return archive->priv->extraction_destination; } - void fr_archive_test (FrArchive *archive, const char *password) @@ -3426,7 +3321,6 @@ fr_archive_test (FrArchive *archive, fr_process_start (archive->process); } - gboolean uri_is_archive (const char *uri) { diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c index 796e03a..8bf85a0 100644 --- a/src/fr-command-7z.c +++ b/src/fr-command-7z.c @@ -49,10 +49,8 @@ static gboolean password_handled = FALSE; static FrCommandClass *parent_class = NULL; - /* -- list -- */ - static time_t mktime_from_string (char *date_s, char *time_s) @@ -88,7 +86,6 @@ mktime_from_string (char *date_s, return mktime (&tm); } - static void list__process_line (char *line, gpointer data) @@ -204,7 +201,6 @@ list__process_line (char *line, g_strfreev (fields); } - static void fr_command_7z_begin_command (FrCommand *comm) { @@ -216,7 +212,6 @@ fr_command_7z_begin_command (FrCommand *comm) fr_process_begin_command (comm->process, "7zr"); } - static void add_password_arg (FrCommand *comm, const char *password, @@ -232,7 +227,6 @@ add_password_arg (FrCommand *comm, } } - static void list__begin (gpointer data) { @@ -245,7 +239,6 @@ list__begin (gpointer data) p7z_comm->list_started = FALSE; } - static void fr_command_7z_list (FrCommand *comm) { @@ -267,7 +260,6 @@ fr_command_7z_list (FrCommand *comm) fr_process_start (comm->process); } - static void parse_progress_line (FrCommand *comm, const char *prefix, @@ -281,7 +273,6 @@ parse_progress_line (FrCommand *comm, fr_command_progress (comm, (double) ++comm->n_file / (comm->n_files + 1)); } - static void process_line__add (char *line, gpointer data) @@ -307,7 +298,6 @@ process_line__add (char *line, parse_progress_line (comm, "Compressing ", _("Adding file: "), line); } - static void fr_command_7z_add (FrCommand *comm, const char *from_file, @@ -403,7 +393,6 @@ fr_command_7z_add (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_7z_delete (FrCommand *comm, const char *from_file, @@ -442,7 +431,6 @@ fr_command_7z_delete (FrCommand *comm, fr_process_end_command (comm->process); } - static void process_line__extract (char *line, gpointer data) @@ -453,7 +441,6 @@ process_line__extract (char *line, parse_progress_line (comm, "Extracting ", _("Extracting file: "), line); } - static void fr_command_7z_extract (FrCommand *comm, const char *from_file, @@ -507,7 +494,6 @@ fr_command_7z_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_7z_test (FrCommand *comm) { @@ -521,7 +507,6 @@ fr_command_7z_test (FrCommand *comm) fr_process_end_command (comm->process); } - static void fr_command_7z_handle_error (FrCommand *comm, FrProcError *error) @@ -577,7 +562,6 @@ fr_command_7z_handle_error (FrCommand *comm, } } - const char *sevenz_mime_types[] = { "application/epub+zip", "application/x-7z-compressed", "application/x-arj", @@ -591,7 +575,6 @@ const char *sevenz_mime_types[] = { "application/epub+zip", "application/zip", /* zip always at the end and the number of */ NULL }; /* place in fr_command_7z_get_mime_types */ - static const char ** fr_command_7z_get_mime_types (FrCommand *comm) { @@ -609,7 +592,6 @@ fr_command_7z_get_mime_types (FrCommand *comm) return sevenz_mime_types; } - static FrCommandCap fr_command_7z_get_capabilities (FrCommand *comm, const char *mime_type, @@ -668,7 +650,6 @@ fr_command_7z_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_7z_get_packages (FrCommand *comm, const char *mime_type) @@ -681,7 +662,6 @@ fr_command_7z_get_packages (FrCommand *comm, return PACKAGES ("p7zip"); } - static void fr_command_7z_class_init (FrCommand7zClass *class) { @@ -704,7 +684,6 @@ fr_command_7z_class_init (FrCommand7zClass *class) afc->get_packages = fr_command_7z_get_packages; } - static void fr_command_7z_init (FrCommand *comm) { @@ -719,7 +698,6 @@ fr_command_7z_init (FrCommand *comm) comm->propListFromFile = TRUE; } - static void fr_command_7z_finalize (GObject *object) { @@ -731,7 +709,6 @@ fr_command_7z_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_7z_get_type () { diff --git a/src/fr-command-ace.c b/src/fr-command-ace.c index 5e36819..90bc152 100644 --- a/src/fr-command-ace.c +++ b/src/fr-command-ace.c @@ -40,10 +40,8 @@ static void fr_command_ace_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ - static time_t mktime_from_string (char *date, char *time) @@ -85,7 +83,6 @@ mktime_from_string (char *date, return mktime (&tm); } - static void process_line (char *line, gpointer data) @@ -164,7 +161,6 @@ process_line (char *line, fr_command_add_file (comm, fdata); } - static void list__begin (gpointer data) { @@ -174,7 +170,6 @@ list__begin (gpointer data) comm->command_type = FR_ACE_COMMAND_UNKNOWN; } - static void fr_command_ace_list (FrCommand *comm) { @@ -189,7 +184,6 @@ fr_command_ace_list (FrCommand *comm) fr_process_start (comm->process); } - static void fr_command_ace_extract (FrCommand *comm, const char *from_file, @@ -219,7 +213,6 @@ fr_command_ace_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_ace_test (FrCommand *comm) { @@ -230,7 +223,6 @@ fr_command_ace_test (FrCommand *comm) fr_process_end_command (comm->process); } - static void fr_command_ace_handle_error (FrCommand *comm, FrProcError *error) @@ -238,17 +230,14 @@ fr_command_ace_handle_error (FrCommand *comm, /* FIXME */ } - const char *ace_mime_type[] = { "application/x-ace", NULL }; - static const char ** fr_command_ace_get_mime_types (FrCommand *comm) { return ace_mime_type; } - static FrCommandCap fr_command_ace_get_capabilities (FrCommand *comm, const char *mime_type, @@ -263,7 +252,6 @@ fr_command_ace_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_ace_get_packages (FrCommand *comm, const char *mime_type) @@ -271,7 +259,6 @@ fr_command_ace_get_packages (FrCommand *comm, return PACKAGES ("unace"); } - static void fr_command_ace_class_init (FrCommandAceClass *class) { @@ -292,7 +279,6 @@ fr_command_ace_class_init (FrCommandAceClass *class) afc->get_packages = fr_command_ace_get_packages; } - static void fr_command_ace_init (FrCommand *comm) { @@ -305,7 +291,6 @@ fr_command_ace_init (FrCommand *comm) comm->propTest = TRUE; } - static void fr_command_ace_finalize (GObject *object) { @@ -317,7 +302,6 @@ fr_command_ace_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_ace_get_type () { diff --git a/src/fr-command-alz.c b/src/fr-command-alz.c index e119dfe..d67c362 100644 --- a/src/fr-command-alz.c +++ b/src/fr-command-alz.c @@ -41,10 +41,8 @@ static void fr_command_alz_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ - static time_t mktime_from_string (char *date_s, char *time_s) @@ -78,7 +76,6 @@ mktime_from_string (char *date_s, return mktime (&tm); } - static void process_line (char *line, gpointer data) @@ -93,7 +90,6 @@ process_line (char *line, g_return_if_fail (line != NULL); - if (! alz_comm->list_started) { if (strncmp (line, "-----", 5 ) == 0 ) alz_comm->list_started = TRUE; @@ -156,7 +152,6 @@ process_line (char *line, g_strfreev (fields); } - static void add_codepage_arg (FrCommand *comm) { @@ -182,7 +177,6 @@ add_codepage_arg (FrCommand *comm) fr_process_add_arg (comm->process, arg); } - static void add_password_arg (FrCommand *comm, const char *password, @@ -198,7 +192,6 @@ add_password_arg (FrCommand *comm, } } - static void list__begin (gpointer data) { @@ -208,7 +201,6 @@ list__begin (gpointer data) comm->invalid_password = FALSE; } - static void fr_command_alz_list (FrCommand *comm) { @@ -224,7 +216,6 @@ fr_command_alz_list (FrCommand *comm) fr_process_start (comm->process); } - /* -- extract -- */ static void @@ -253,7 +244,6 @@ process_extract_line (char *line, } } - static void fr_command_alz_extract (FrCommand *comm, const char *from_file, @@ -284,7 +274,6 @@ fr_command_alz_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_alz_handle_error (FrCommand *comm, FrProcError *error) @@ -297,17 +286,14 @@ fr_command_alz_handle_error (FrCommand *comm, } } - const char *alz_mime_type[] = { "application/x-alz", NULL }; - static const char ** fr_command_alz_get_mime_types (FrCommand *comm) { return alz_mime_type; } - static FrCommandCap fr_command_alz_get_capabilities (FrCommand *comm, const char *mime_type, @@ -322,7 +308,6 @@ fr_command_alz_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_alz_get_packages (FrCommand *comm, const char *mime_type) @@ -330,7 +315,6 @@ fr_command_alz_get_packages (FrCommand *comm, return PACKAGES ("unalz"); } - static void fr_command_alz_class_init (FrCommandAlzClass *class) { @@ -352,7 +336,6 @@ fr_command_alz_class_init (FrCommandAlzClass *class) afc->get_packages = fr_command_alz_get_packages; } - static void fr_command_alz_init (FrCommand *comm) { @@ -365,7 +348,6 @@ fr_command_alz_init (FrCommand *comm) comm->propTest = FALSE; } - static void fr_command_alz_finalize (GObject *object) { @@ -377,7 +359,6 @@ fr_command_alz_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_alz_get_type () { diff --git a/src/fr-command-ar.c b/src/fr-command-ar.c index 6aab37e..83b29a9 100644 --- a/src/fr-command-ar.c +++ b/src/fr-command-ar.c @@ -119,7 +119,6 @@ process_line (char *line, fr_command_add_file (comm, fdata); } - static void fr_command_ar_list (FrCommand *comm) { @@ -132,7 +131,6 @@ fr_command_ar_list (FrCommand *comm) fr_process_start (comm->process); } - static void fr_command_ar_add (FrCommand *comm, const char *from_file, @@ -161,7 +159,6 @@ fr_command_ar_add (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_ar_delete (FrCommand *comm, const char *from_file, @@ -177,7 +174,6 @@ fr_command_ar_delete (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_ar_extract (FrCommand *comm, const char *from_file, @@ -201,7 +197,6 @@ fr_command_ar_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_ar_handle_error (FrCommand *comm, FrProcError *error) @@ -209,19 +204,16 @@ fr_command_ar_handle_error (FrCommand *comm, /* FIXME */ } - const char *ar_mime_type[] = { "application/x-archive", "application/vnd.debian.binary-package", NULL }; - static const char ** fr_command_ar_get_mime_types (FrCommand *comm) { return ar_mime_type; } - static FrCommandCap fr_command_ar_get_capabilities (FrCommand *comm, const char *mime_type, @@ -240,7 +232,6 @@ fr_command_ar_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_ar_get_packages (FrCommand *comm, const char *mime_type) @@ -248,7 +239,6 @@ fr_command_ar_get_packages (FrCommand *comm, return PACKAGES ("binutils"); } - static void fr_command_ar_class_init (FrCommandArClass *class) { @@ -270,7 +260,6 @@ fr_command_ar_class_init (FrCommandArClass *class) afc->get_packages = fr_command_ar_get_packages; } - static void fr_command_ar_init (FrCommand *comm) { @@ -284,7 +273,6 @@ fr_command_ar_init (FrCommand *comm) comm->propTest = FALSE; } - static void fr_command_ar_finalize (GObject *object) { @@ -296,7 +284,6 @@ fr_command_ar_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_ar_get_type () { diff --git a/src/fr-command-arj.c b/src/fr-command-arj.c index a6f0f71..49aaf29 100644 --- a/src/fr-command-arj.c +++ b/src/fr-command-arj.c @@ -40,7 +40,6 @@ static void fr_command_arj_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ static time_t @@ -84,7 +83,6 @@ mktime_from_string (char *date_s, return mktime (&tm); } - static void list__process_line (char *line, gpointer data) @@ -158,7 +156,6 @@ list__process_line (char *line, arj_comm->line_no++; } - static void fr_command_arj_list (FrCommand *comm) { @@ -173,7 +170,6 @@ fr_command_arj_list (FrCommand *comm) fr_process_start (comm->process); } - static void fr_command_arj_add (FrCommand *comm, const char *from_file, @@ -220,7 +216,6 @@ fr_command_arj_add (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_arj_delete (FrCommand *comm, const char *from_file, @@ -242,7 +237,6 @@ fr_command_arj_delete (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_arj_extract (FrCommand *comm, const char *from_file, @@ -287,7 +281,6 @@ fr_command_arj_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_arj_test (FrCommand *comm) { @@ -302,7 +295,6 @@ fr_command_arj_test (FrCommand *comm) fr_process_end_command (comm->process); } - static void fr_command_arj_handle_error (FrCommand *comm, FrProcError *error) @@ -315,17 +307,14 @@ fr_command_arj_handle_error (FrCommand *comm, } } - const char *arj_mime_type[] = { "application/x-arj", NULL }; - static const char ** fr_command_arj_get_mime_types (FrCommand *comm) { return arj_mime_type; } - static FrCommandCap fr_command_arj_get_capabilities (FrCommand *comm, const char *mime_type, @@ -340,7 +329,6 @@ fr_command_arj_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_arj_get_packages (FrCommand *comm, const char *mime_type) @@ -348,7 +336,6 @@ fr_command_arj_get_packages (FrCommand *comm, return PACKAGES ("arj"); } - static void fr_command_arj_class_init (FrCommandArjClass *class) { @@ -371,7 +358,6 @@ fr_command_arj_class_init (FrCommandArjClass *class) afc->get_packages = fr_command_arj_get_packages; } - static void fr_command_arj_init (FrCommand *comm) { @@ -392,7 +378,6 @@ fr_command_arj_init (FrCommand *comm) arj_comm->filename_line_regex = g_regex_new ("[0-9]+\\) ", G_REGEX_OPTIMIZE, 0, NULL); } - static void fr_command_arj_finalize (GObject *object) { @@ -409,7 +394,6 @@ fr_command_arj_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_arj_get_type () { diff --git a/src/fr-command-cfile.c b/src/fr-command-cfile.c index a914abe..d2a2afa 100644 --- a/src/fr-command-cfile.c +++ b/src/fr-command-cfile.c @@ -37,12 +37,10 @@ #include "fr-command.h" #include "fr-command-cfile.h" - /* Parent Class */ static FrCommandClass *parent_class = NULL; - static char * get_uncompressed_name_from_archive (FrCommand *comm, const char *archive) @@ -94,7 +92,6 @@ get_uncompressed_name_from_archive (FrCommand *comm, return filename; } - static void list__process_line (char *line, gpointer data) @@ -136,7 +133,6 @@ list__process_line (char *line, fr_command_add_file (comm, fdata); } - static void fr_command_cfile_list (FrCommand *comm) { @@ -194,7 +190,6 @@ fr_command_cfile_list (FrCommand *comm) } } - static void fr_command_cfile_add (FrCommand *comm, const char *from_file, @@ -333,7 +328,6 @@ fr_command_cfile_add (FrCommand *comm, g_free (temp_dir); } - static void fr_command_cfile_delete (FrCommand *comm, const char *from_file, @@ -342,7 +336,6 @@ fr_command_cfile_delete (FrCommand *comm, /* never called */ } - static void fr_command_cfile_extract (FrCommand *comm, const char *from_file, @@ -545,14 +538,12 @@ const char *cfile_mime_type[] = { "application/x-gzip", ZSTD_MIME_TYPE, NULL }; - static const char ** fr_command_cfile_get_mime_types (FrCommand *comm) { return cfile_mime_type; } - static FrCommandCap fr_command_cfile_get_capabilities (FrCommand *comm, const char *mime_type, @@ -607,7 +598,6 @@ fr_command_cfile_get_capabilities (FrCommand *comm, return capabilities; } - static void fr_command_cfile_finalize (GObject *object) { @@ -619,7 +609,6 @@ fr_command_cfile_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - static const char * fr_command_cfile_get_packages (FrCommand *comm, const char *mime_type) @@ -648,7 +637,6 @@ fr_command_cfile_get_packages (FrCommand *comm, return NULL; } - static void fr_command_cfile_class_init (FrCommandCFileClass *class) { @@ -670,7 +658,6 @@ fr_command_cfile_class_init (FrCommandCFileClass *class) afc->get_packages = fr_command_cfile_get_packages; } - static void fr_command_cfile_init (FrCommand *comm) { @@ -683,7 +670,6 @@ fr_command_cfile_init (FrCommand *comm) comm->propTest = TRUE; } - GType fr_command_cfile_get_type () { diff --git a/src/fr-command-cpio.c b/src/fr-command-cpio.c index 1b380ad..7a74f51 100644 --- a/src/fr-command-cpio.c +++ b/src/fr-command-cpio.c @@ -41,7 +41,6 @@ static void fr_command_cpio_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ static time_t @@ -85,7 +84,6 @@ mktime_from_string (char *month, return mktime (&tm); } - static void list__process_line (char *line, gpointer data) @@ -170,7 +168,6 @@ list__process_line (char *line, fr_command_add_file (comm, fdata); } - static void fr_command_cpio_list (FrCommand *comm) { @@ -183,7 +180,6 @@ fr_command_cpio_list (FrCommand *comm) fr_process_start (comm->process); } - static void fr_command_cpio_extract (FrCommand *comm, const char *from_file, @@ -223,17 +219,14 @@ fr_command_cpio_extract (FrCommand *comm, fr_process_end_command (comm->process); } - const char *cpio_mime_type[] = { "application/x-cpio", NULL }; - static const char ** fr_command_cpio_get_mime_types (FrCommand *comm) { return cpio_mime_type; } - static FrCommandCap fr_command_cpio_get_capabilities (FrCommand *comm, const char *mime_type, @@ -248,7 +241,6 @@ fr_command_cpio_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_cpio_get_packages (FrCommand *comm, const char *mime_type) @@ -256,7 +248,6 @@ fr_command_cpio_get_packages (FrCommand *comm, return PACKAGES ("cpio"); } - static void fr_command_cpio_class_init (FrCommandCpioClass *class) { @@ -275,7 +266,6 @@ fr_command_cpio_class_init (FrCommandCpioClass *class) afc->get_packages = fr_command_cpio_get_packages; } - static void fr_command_cpio_init (FrCommand *comm) { @@ -289,7 +279,6 @@ fr_command_cpio_init (FrCommand *comm) comm->propTest = FALSE; } - static void fr_command_cpio_finalize (GObject *object) { @@ -301,7 +290,6 @@ fr_command_cpio_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_cpio_get_type () { diff --git a/src/fr-command-dpkg.c b/src/fr-command-dpkg.c index 29472e1..c159b5f 100644 --- a/src/fr-command-dpkg.c +++ b/src/fr-command-dpkg.c @@ -160,7 +160,6 @@ process_data_line (char *line, fr_command_add_file (comm, fdata); } - static void fr_command_dpkg_list (FrCommand *comm) { @@ -179,7 +178,6 @@ fr_command_dpkg_list (FrCommand *comm) fr_process_start (comm->process); } - static void fr_command_dpkg_extract (FrCommand *comm, const char *from_file, @@ -210,17 +208,14 @@ fr_command_dpkg_extract (FrCommand *comm, fr_process_end_command (comm->process); } - const char *dpkg_mime_type[] = { "application/vnd.debian.binary-package", NULL }; - static const char ** fr_command_dpkg_get_mime_types (FrCommand *comm) { return dpkg_mime_type; } - static FrCommandCap fr_command_dpkg_get_capabilities (FrCommand *comm, const char *mime_type, @@ -235,7 +230,6 @@ fr_command_dpkg_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_dpkg_get_packages (FrCommand *comm, const char *mime_type) @@ -243,7 +237,6 @@ fr_command_dpkg_get_packages (FrCommand *comm, return PACKAGES ("dpkg"); } - static void fr_command_dpkg_class_init (FrCommandDpkgClass *class) { @@ -262,7 +255,6 @@ fr_command_dpkg_class_init (FrCommandDpkgClass *class) afc->get_packages = fr_command_dpkg_get_packages; } - static void fr_command_dpkg_init (FrCommand *comm) { @@ -275,7 +267,6 @@ fr_command_dpkg_init (FrCommand *comm) comm->propTest = FALSE; } - static void fr_command_dpkg_finalize (GObject *object) { @@ -287,7 +278,6 @@ fr_command_dpkg_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_dpkg_get_type () { diff --git a/src/fr-command-iso.c b/src/fr-command-iso.c index ccc2333..aa8706e 100644 --- a/src/fr-command-iso.c +++ b/src/fr-command-iso.c @@ -41,7 +41,6 @@ static void fr_command_iso_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - static time_t mktime_from_string (char *month, char *mday, @@ -69,7 +68,6 @@ mktime_from_string (char *month, return mktime (&tm); } - static void list__process_line (char *line, gpointer data) @@ -128,7 +126,6 @@ list__process_line (char *line, } } - static void list__begin (gpointer data) { @@ -138,7 +135,6 @@ list__begin (gpointer data) comm->cur_path = NULL; } - static void fr_command_iso_list (FrCommand *comm) { @@ -155,7 +151,6 @@ fr_command_iso_list (FrCommand *comm) fr_process_start (comm->process); } - static void fr_command_iso_extract (FrCommand *comm, const char *from_file, @@ -200,17 +195,14 @@ fr_command_iso_extract (FrCommand *comm, } } - const char *iso_mime_type[] = { "application/x-cd-image", NULL }; - static const char ** fr_command_iso_get_mime_types (FrCommand *comm) { return iso_mime_type; } - static FrCommandCap fr_command_iso_get_capabilities (FrCommand *comm, const char *mime_type, @@ -225,7 +217,6 @@ fr_command_iso_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_iso_get_packages (FrCommand *comm, const char *mime_type) @@ -233,7 +224,6 @@ fr_command_iso_get_packages (FrCommand *comm, return PACKAGES ("genisoimage"); } - static void fr_command_iso_class_init (FrCommandIsoClass *class) { @@ -252,7 +242,6 @@ fr_command_iso_class_init (FrCommandIsoClass *class) afc->get_packages = fr_command_iso_get_packages; } - static void fr_command_iso_init (FrCommand *comm) { @@ -271,7 +260,6 @@ fr_command_iso_init (FrCommand *comm) comm->propCanExtractAll = FALSE; } - static void fr_command_iso_finalize (GObject *object) { @@ -290,7 +278,6 @@ fr_command_iso_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_iso_get_type () { diff --git a/src/fr-command-jar.c b/src/fr-command-jar.c index 03e7cd9..d5d1936 100644 --- a/src/fr-command-jar.c +++ b/src/fr-command-jar.c @@ -31,7 +31,6 @@ #include "fr-command-jar.h" #include "java-utils.h" - typedef struct { char *filename; char *rel_path; @@ -39,15 +38,12 @@ typedef struct { char *link_name; /* package dir = package_minus_one_level + '/' + link_name */ } JarData; - static void fr_command_jar_class_init (FrCommandJarClass *class); static void fr_command_jar_init (FrCommand *afile); static void fr_command_jar_finalize (GObject *object); - static FrCommandClass *parent_class = NULL; - static void fr_command_jar_add (FrCommand *comm, const char *from_file, @@ -145,18 +141,15 @@ fr_command_jar_add (FrCommand *comm, g_free (tmp_dir); } - const char *jar_mime_type[] = { "application/x-java-archive", NULL }; - static const char ** fr_command_jar_get_mime_types (FrCommand *comm) { return jar_mime_type; } - static FrCommandCap fr_command_jar_get_capabilities (FrCommand *comm, const char *mime_type, @@ -171,7 +164,6 @@ fr_command_jar_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_jar_get_packages (FrCommand *comm, const char *mime_type) @@ -179,7 +171,6 @@ fr_command_jar_get_packages (FrCommand *comm, return PACKAGES ("zip,unzip"); } - static void fr_command_jar_class_init (FrCommandJarClass *class) { @@ -196,13 +187,11 @@ fr_command_jar_class_init (FrCommandJarClass *class) afc->get_packages = fr_command_jar_get_packages; } - static void fr_command_jar_init (FrCommand *comm) { } - static void fr_command_jar_finalize (GObject *object) { @@ -214,7 +203,6 @@ fr_command_jar_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_jar_get_type () { diff --git a/src/fr-command-lha.c b/src/fr-command-lha.c index 9996bba..54d8354 100644 --- a/src/fr-command-lha.c +++ b/src/fr-command-lha.c @@ -40,7 +40,6 @@ static void fr_command_lha_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ static time_t @@ -93,7 +92,6 @@ mktime_from_string (char *month, return mktime (&tm); } - static char ** split_line_lha (char *line) { @@ -141,7 +139,6 @@ split_line_lha (char *line) return fields; } - static const char * get_last_field_lha (char *line) { @@ -170,7 +167,6 @@ get_last_field_lha (char *line) return field; } - static void process_line (char *line, gpointer data) @@ -219,7 +215,6 @@ process_line (char *line, fr_command_add_file (comm, fdata); } - static void fr_command_lha_list (FrCommand *comm) { @@ -232,7 +227,6 @@ fr_command_lha_list (FrCommand *comm) fr_process_start (comm->process); } - static void fr_command_lha_add (FrCommand *comm, const char *from_file, @@ -256,7 +250,6 @@ fr_command_lha_add (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_lha_delete (FrCommand *comm, const char *from_file, @@ -272,7 +265,6 @@ fr_command_lha_delete (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_lha_extract (FrCommand *comm, const char *from_file, @@ -311,7 +303,6 @@ fr_command_lha_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_lha_test (FrCommand *comm) { @@ -321,17 +312,14 @@ fr_command_lha_test (FrCommand *comm) fr_process_end_command (comm->process); } - const char *lha_mime_type[] = { "application/x-lzh-compressed", "application/x-lha", NULL }; - static const char ** fr_command_lha_get_mime_types (FrCommand *comm) { return lha_mime_type; } - static FrCommandCap fr_command_lha_get_capabilities (FrCommand *comm, const char *mime_type, @@ -346,7 +334,6 @@ fr_command_lha_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_lha_get_packages (FrCommand *comm, const char *mime_type) @@ -354,7 +341,6 @@ fr_command_lha_get_packages (FrCommand *comm, return PACKAGES ("lha"); } - static void fr_command_lha_class_init (FrCommandLhaClass *class) { @@ -376,7 +362,6 @@ fr_command_lha_class_init (FrCommandLhaClass *class) afc->get_packages = fr_command_lha_get_packages; } - static void fr_command_lha_init (FrCommand *comm) { @@ -390,7 +375,6 @@ fr_command_lha_init (FrCommand *comm) comm->propTest = TRUE; } - static void fr_command_lha_finalize (GObject *object) { @@ -402,7 +386,6 @@ fr_command_lha_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_lha_get_type () { diff --git a/src/fr-command-lrzip.c b/src/fr-command-lrzip.c index cf07d33..a535b1e 100644 --- a/src/fr-command-lrzip.c +++ b/src/fr-command-lrzip.c @@ -28,10 +28,8 @@ static void fr_command_lrzip_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ - static void list__process_line (char *line, gpointer data) @@ -82,7 +80,6 @@ list__process_line (char *line, fr_command_add_file (comm, fdata); } - static void fr_command_lrzip_list (FrCommand *comm) { @@ -95,7 +92,6 @@ fr_command_lrzip_list (FrCommand *comm) fr_process_start (comm->process); } - static void fr_command_lrzip_add (FrCommand *comm, const char *from_file, @@ -152,7 +148,6 @@ fr_command_lrzip_extract (FrCommand *comm, fr_process_end_command (comm->process); } - /* static void fr_command_lrzip_test (FrCommand *comm) @@ -164,17 +159,14 @@ fr_command_lrzip_test (FrCommand *comm) } */ - const char *lrzip_mime_type[] = { "application/x-lrzip", NULL }; - static const char ** fr_command_lrzip_get_mime_types (FrCommand *comm) { return lrzip_mime_type; } - static FrCommandCap fr_command_lrzip_get_capabilities (FrCommand *comm, const char *mime_type, @@ -188,7 +180,6 @@ fr_command_lrzip_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_lrzip_get_packages (FrCommand *comm, const char *mime_type) @@ -196,7 +187,6 @@ fr_command_lrzip_get_packages (FrCommand *comm, return PACKAGES ("lrzip"); } - static void fr_command_lrzip_class_init (FrCommandLrzipClass *class) { @@ -216,7 +206,6 @@ fr_command_lrzip_class_init (FrCommandLrzipClass *class) afc->get_packages = fr_command_lrzip_get_packages; } - static void fr_command_lrzip_init (FrCommand *comm) { @@ -230,7 +219,6 @@ fr_command_lrzip_init (FrCommand *comm) comm->propTest = FALSE; } - static void fr_command_lrzip_finalize (GObject *object) { @@ -242,7 +230,6 @@ fr_command_lrzip_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_lrzip_get_type () { diff --git a/src/fr-command-nomarch.c b/src/fr-command-nomarch.c index c23248a..67655e7 100644 --- a/src/fr-command-nomarch.c +++ b/src/fr-command-nomarch.c @@ -44,7 +44,6 @@ static void fr_command_nomarch_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ static time_t @@ -95,7 +94,6 @@ list__process_line (char *line, fr_command_add_file (comm, fdata); } - static void fr_command_nomarch_list (FrCommand *comm) { @@ -108,7 +106,6 @@ fr_command_nomarch_list (FrCommand *comm) fr_process_start (comm->process); } - static void fr_command_nomarch_add (FrCommand *comm, const char *from_file, @@ -137,7 +134,6 @@ fr_command_nomarch_add (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_nomarch_delete (FrCommand *comm, const char *from_file, @@ -155,7 +151,6 @@ fr_command_nomarch_delete (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_nomarch_extract (FrCommand *comm, const char *from_file, @@ -180,7 +175,6 @@ fr_command_nomarch_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_nomarch_test (FrCommand *comm) { @@ -190,7 +184,6 @@ fr_command_nomarch_test (FrCommand *comm) fr_process_end_command (comm->process); } - static void fr_command_nomarch_handle_error (FrCommand *comm, FrProcError *error) @@ -203,17 +196,14 @@ fr_command_nomarch_handle_error (FrCommand *comm, } } - const char *nomarch_mime_type[] = { "application/x-arc", NULL }; - static const char ** fr_command_nomarch_get_mime_types (FrCommand *comm) { return nomarch_mime_type; } - static FrCommandCap fr_command_nomarch_get_capabilities (FrCommand *comm, const char *mime_type, @@ -230,7 +220,6 @@ fr_command_nomarch_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_nomarch_get_packages (FrCommand *comm, const char *mime_type) @@ -238,7 +227,6 @@ fr_command_nomarch_get_packages (FrCommand *comm, return PACKAGES ("nomarch,arc"); } - static void fr_command_nomarch_class_init (FrCommandNomarchClass *class) { @@ -261,7 +249,6 @@ fr_command_nomarch_class_init (FrCommandNomarchClass *class) afc->get_packages = fr_command_nomarch_get_packages; } - static void fr_command_nomarch_init (FrCommand *comm) { @@ -280,7 +267,6 @@ fr_command_nomarch_init (FrCommand *comm) nomarch_comm->fdata = FALSE; } - static void fr_command_nomarch_finalize (GObject *object) { @@ -292,7 +278,6 @@ fr_command_nomarch_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_nomarch_get_type () { diff --git a/src/fr-command-rar.c b/src/fr-command-rar.c index e2eb8df..a90b03b 100644 --- a/src/fr-command-rar.c +++ b/src/fr-command-rar.c @@ -45,7 +45,6 @@ static void fr_command_rar_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* rar 5.30 and later uses YYYY-MM-DD instead DD-MM-YY in the listing output */ static gboolean date_newstyle = FALSE; @@ -56,7 +55,6 @@ have_rar (void) return is_program_in_path ("rar"); } - /* -- list -- */ /* @@ -76,8 +74,6 @@ Details: RAR 4 ----------- --------- -------- ----- ---------- ----- -------- ---- 3165 1318 41% 2 - - // SAMPLE RAR VERSION 5.00 TO 5.21 LISTING OUTPUT: RAR 5.21 Copyright (c) 1993-2015 Alexander Roshal 15 Feb 2015 @@ -93,8 +89,6 @@ Details: RAR 4 ----------- --------- -------- ----- -------- ----- -------- ---- 3165 1318 41% 2 - - // SAMPLE RAR VERSION 4.20 AND OLDER LISTING OUTPUT: RAR 4.20 Copyright (c) 1993-2012 Alexander Roshal 9 Jun 2012 @@ -351,7 +345,6 @@ process_line (char *line, rar_comm->rar4_odd_line = ! rar_comm->rar4_odd_line; } - static void add_password_arg (FrCommand *comm, const char *password, @@ -367,7 +360,6 @@ add_password_arg (FrCommand *comm, fr_process_add_arg (comm->process, "-p-"); } - static void list__begin (gpointer data) { @@ -376,7 +368,6 @@ list__begin (gpointer data) comm->list_started = FALSE; } - static void fr_command_rar_list (FrCommand *comm) { @@ -404,7 +395,6 @@ fr_command_rar_list (FrCommand *comm) fr_process_start (comm->process); } - static void parse_progress_line (FrCommand *comm, const char *prefix, @@ -415,7 +405,6 @@ parse_progress_line (FrCommand *comm, fr_command_progress (comm, (double) ++comm->n_file / (comm->n_files + 1)); } - static void process_line__add (char *line, gpointer data) @@ -451,7 +440,6 @@ process_line__add (char *line, parse_progress_line (comm, "Adding ", _("Adding file: "), line); } - static void fr_command_rar_add (FrCommand *comm, const char *from_file, @@ -508,7 +496,6 @@ fr_command_rar_add (FrCommand *comm, fr_process_end_command (comm->process); } - static void process_line__delete (char *line, gpointer data) @@ -529,7 +516,6 @@ process_line__delete (char *line, parse_progress_line (comm, "Deleting ", _("Removing file: "), line); } - static void fr_command_rar_delete (FrCommand *comm, const char *from_file, @@ -557,7 +543,6 @@ fr_command_rar_delete (FrCommand *comm, fr_process_end_command (comm->process); } - static void process_line__extract (char *line, gpointer data) @@ -578,7 +563,6 @@ process_line__extract (char *line, parse_progress_line (comm, "Extracting ", _("Extracting file: "), line); } - static void fr_command_rar_extract (FrCommand *comm, const char *from_file, @@ -636,7 +620,6 @@ fr_command_rar_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_rar_test (FrCommand *comm) { @@ -659,7 +642,6 @@ fr_command_rar_test (FrCommand *comm) fr_process_end_command (comm->process); } - static void fr_command_rar_handle_error (FrCommand *comm, FrProcError *error) @@ -713,19 +695,16 @@ fr_command_rar_handle_error (FrCommand *comm, } } - const char *rar_mime_type[] = { "application/x-cbr", "application/x-rar", NULL }; - static const char ** fr_command_rar_get_mime_types (FrCommand *comm) { return rar_mime_type; } - static FrCommandCap fr_command_rar_get_capabilities (FrCommand *comm, const char *mime_type, @@ -746,7 +725,6 @@ fr_command_rar_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_rar_get_packages (FrCommand *comm, const char *mime_type) @@ -754,7 +732,6 @@ fr_command_rar_get_packages (FrCommand *comm, return PACKAGES ("rar,unrar"); } - static void fr_command_rar_class_init (FrCommandRarClass *class) { @@ -777,7 +754,6 @@ fr_command_rar_class_init (FrCommandRarClass *class) afc->get_packages = fr_command_rar_get_packages; } - static void fr_command_rar_init (FrCommand *comm) { @@ -792,7 +768,6 @@ fr_command_rar_init (FrCommand *comm) comm->propListFromFile = TRUE; } - static void fr_command_rar_finalize (GObject *object) { @@ -804,7 +779,6 @@ fr_command_rar_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_rar_get_type () { diff --git a/src/fr-command-rpm.c b/src/fr-command-rpm.c index 5fff8d7..2d81fc1 100644 --- a/src/fr-command-rpm.c +++ b/src/fr-command-rpm.c @@ -41,7 +41,6 @@ static void fr_command_rpm_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ static time_t @@ -95,7 +94,6 @@ mktime_from_string (char *month, return mktime (&tm); } - static void list__process_line (char *line, gpointer data) @@ -179,7 +177,6 @@ list__process_line (char *line, fr_command_add_file (comm, fdata); } - static void fr_command_rpm_list (FrCommand *comm) { @@ -192,7 +189,6 @@ fr_command_rpm_list (FrCommand *comm) fr_process_start (comm->process); } - static void fr_command_rpm_extract (FrCommand *comm, const char *from_file, @@ -225,17 +221,14 @@ fr_command_rpm_extract (FrCommand *comm, fr_process_end_command (comm->process); } - const char *rpm_mime_type[] = { "application/x-rpm", NULL }; - static const char ** fr_command_rpm_get_mime_types (FrCommand *comm) { return rpm_mime_type; } - static FrCommandCap fr_command_rpm_get_capabilities (FrCommand *comm, const char *mime_type, @@ -251,7 +244,6 @@ fr_command_rpm_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_rpm_get_packages (FrCommand *comm, const char *mime_type) @@ -259,7 +251,6 @@ fr_command_rpm_get_packages (FrCommand *comm, return PACKAGES ("cpio,rpm"); } - static void fr_command_rpm_class_init (FrCommandRpmClass *class) { @@ -278,7 +269,6 @@ fr_command_rpm_class_init (FrCommandRpmClass *class) afc->get_packages = fr_command_rpm_get_packages; } - static void fr_command_rpm_init (FrCommand *comm) { @@ -291,7 +281,6 @@ fr_command_rpm_init (FrCommand *comm) comm->propTest = FALSE; } - static void fr_command_rpm_finalize (GObject *object) { @@ -303,7 +292,6 @@ fr_command_rpm_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_rpm_get_type () { diff --git a/src/fr-command-tar.c b/src/fr-command-tar.c index 50aae1a..a430645 100644 --- a/src/fr-command-tar.c +++ b/src/fr-command-tar.c @@ -50,7 +50,6 @@ static void fr_command_tar_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ static time_t @@ -62,7 +61,6 @@ mktime_from_string (const char *time_s) return mktime (&tm); } - static char* tar_get_last_field (const char *line, int start_from, @@ -92,7 +90,6 @@ tar_get_last_field (const char *line, return g_strdup (f_start); } - static void process_line (char *line, gpointer data) @@ -161,7 +158,6 @@ process_line (char *line, fr_command_add_file (comm, fdata); } - static void add_compress_arg (FrCommand *comm) { @@ -211,7 +207,6 @@ add_compress_arg (FrCommand *comm) } } - static void begin_tar_command (FrCommand *comm) { @@ -233,7 +228,6 @@ begin_tar_command (FrCommand *comm) g_free (command); } - static void fr_command_tar_list (FrCommand *comm) { @@ -249,14 +243,12 @@ fr_command_tar_list (FrCommand *comm) fr_process_start (comm->process); } - static gboolean can_create_a_compressed_archive (FrCommand *comm) { return comm->creating_archive && ! is_mime_type (comm->mime_type, "application/x-7z-compressed-tar"); } - static void process_line__generic (char *line, gpointer data, @@ -281,7 +273,6 @@ process_line__generic (char *line, } } - static void process_line__add (char *line, gpointer data) @@ -290,7 +281,6 @@ process_line__add (char *line, process_line__generic (line, data, _("Adding file: ")); } - static void fr_command_tar_add (FrCommand *comm, const char *from_file, @@ -347,7 +337,6 @@ fr_command_tar_add (FrCommand *comm, fr_process_end_command (comm->process); } - static void process_line__delete (char *line, gpointer data) @@ -356,7 +345,6 @@ process_line__delete (char *line, process_line__generic (line, data, _("Removing file: ")); } - static void begin_func__delete (gpointer data) { @@ -365,7 +353,6 @@ begin_func__delete (gpointer data) fr_command_message (comm, _("Deleting files from archive")); } - static void fr_command_tar_delete (FrCommand *comm, const char *from_file, @@ -402,7 +389,6 @@ fr_command_tar_delete (FrCommand *comm, fr_process_end_command (comm->process); } - static void process_line__extract (char *line, gpointer data) @@ -411,7 +397,6 @@ process_line__extract (char *line, process_line__generic (line, data, _("Extracting file: ")); } - static void fr_command_tar_extract (FrCommand *comm, const char *from_file, @@ -462,7 +447,6 @@ fr_command_tar_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void begin_func__recompress (gpointer data) { @@ -471,7 +455,6 @@ begin_func__recompress (gpointer data) fr_command_message (comm, _("Recompressing archive")); } - static gboolean gzip_continue_func (gpointer user_data) { @@ -488,7 +471,6 @@ gzip_continue_func (gpointer user_data) return comm->process->error.status == 0; } - static void fr_command_tar_recompress (FrCommand *comm) { @@ -722,7 +704,6 @@ fr_command_tar_recompress (FrCommand *comm) c_tar->uncomp_filename = NULL; } - static void begin_func__uncompress (gpointer data) { @@ -731,7 +712,6 @@ begin_func__uncompress (gpointer data) fr_command_message (comm, _("Decompressing archive")); } - static char * get_uncompressed_name (FrCommandTar *c_tar, const char *e_filename) @@ -835,7 +815,6 @@ get_uncompressed_name (FrCommandTar *c_tar, return new_name; } - static char * get_temp_name (FrCommandTar *c_tar, const char *filepath) @@ -853,7 +832,6 @@ get_temp_name (FrCommandTar *c_tar, return temp_name; } - static void fr_command_tar_uncompress (FrCommand *comm) { @@ -995,7 +973,6 @@ fr_command_tar_uncompress (FrCommand *comm) g_free (tmp_name); } - static void fr_command_tar_handle_error (FrCommand *comm, FrProcError *error) @@ -1006,7 +983,6 @@ fr_command_tar_handle_error (FrCommand *comm, } } - const char *tar_mime_types[] = { "application/x-compressed-tar", "application/x-brotli-compressed-tar", "application/x-bzip-compressed-tar", @@ -1021,14 +997,12 @@ const char *tar_mime_types[] = { "application/x-compressed-tar", "application/x-zstd-compressed-tar", NULL }; - static const char ** fr_command_tar_get_mime_types (FrCommand *comm) { return tar_mime_types; } - static FrCommandCap fr_command_tar_get_capabilities (FrCommand *comm, const char *mime_type, @@ -1102,7 +1076,6 @@ fr_command_tar_get_capabilities (FrCommand *comm, return capabilities; } - static void fr_command_tar_set_mime_type (FrCommand *comm, const char *mime_type) @@ -1124,7 +1097,6 @@ fr_command_tar_set_mime_type (FrCommand *comm, } } - static const char * fr_command_tar_get_packages (FrCommand *comm, const char *mime_type) @@ -1157,7 +1129,6 @@ fr_command_tar_get_packages (FrCommand *comm, return NULL; } - static void fr_command_tar_class_init (FrCommandTarClass *class) { @@ -1182,7 +1153,6 @@ fr_command_tar_class_init (FrCommandTarClass *class) afc->get_packages = fr_command_tar_get_packages; } - static void fr_command_tar_init (FrCommand *comm) { @@ -1204,7 +1174,6 @@ fr_command_tar_init (FrCommand *comm) comm_tar->uncomp_filename = NULL; } - static void fr_command_tar_finalize (GObject *object) { @@ -1235,7 +1204,6 @@ fr_command_tar_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_tar_get_type () { diff --git a/src/fr-command-unarchiver.c b/src/fr-command-unarchiver.c index 0a40e6b..7518fb5 100644 --- a/src/fr-command-unarchiver.c +++ b/src/fr-command-unarchiver.c @@ -46,10 +46,8 @@ static void fr_command_unarchiver_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ - static void process_line (char *line, gpointer data) @@ -58,7 +56,6 @@ process_line (char *line, g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (unar_comm->stream), line, -1, NULL); } - static time_t mktime_from_string (const char *time_s) { @@ -125,7 +122,6 @@ list_command_completed (gpointer data) g_object_unref (parser); } - static void fr_command_unarchiver_list (FrCommand *comm) { @@ -147,7 +143,6 @@ fr_command_unarchiver_list (FrCommand *comm) fr_process_start (comm->process); } - static void process_line__extract (char *line, gpointer data) @@ -172,7 +167,6 @@ process_line__extract (char *line, fr_command_message (comm, line); } - static void fr_command_unarchiver_extract (FrCommand *comm, const char *from_file, @@ -220,7 +214,6 @@ fr_command_unarchiver_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_unarchiver_handle_error (FrCommand *comm, FrProcError *error) @@ -251,20 +244,17 @@ fr_command_unarchiver_handle_error (FrCommand *comm, } } - const char *unarchiver_mime_type[] = { "application/zip", "application/x-cbr", "application/x-rar", NULL }; - static const char ** fr_command_unarchiver_get_mime_types (FrCommand *comm) { return unarchiver_mime_type; } - static FrCommandCap fr_command_unarchiver_get_capabilities (FrCommand *comm, const char *mime_type, @@ -279,7 +269,6 @@ fr_command_unarchiver_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_unarchiver_get_packages (FrCommand *comm, const char *mime_type) @@ -287,7 +276,6 @@ fr_command_unarchiver_get_packages (FrCommand *comm, return PACKAGES ("unarchiver"); } - static void fr_command_unarchiver_class_init (FrCommandUnarchiverClass *class) { @@ -307,7 +295,6 @@ fr_command_unarchiver_class_init (FrCommandUnarchiverClass *class) afc->get_packages = fr_command_unarchiver_get_packages; } - static void fr_command_unarchiver_init (FrCommand *comm) { @@ -324,7 +311,6 @@ fr_command_unarchiver_init (FrCommand *comm) unar_comm->stream = NULL; } - static void fr_command_unarchiver_finalize (GObject *object) { @@ -341,7 +327,6 @@ fr_command_unarchiver_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_unarchiver_get_type () { diff --git a/src/fr-command-unstuff.c b/src/fr-command-unstuff.c index 00f0ff2..54ab129 100644 --- a/src/fr-command-unstuff.c +++ b/src/fr-command-unstuff.c @@ -71,7 +71,6 @@ recursive_rmdir (const char *path) g_dir_close (dir); } - /* unstuff doesn't like file paths starting with /, that's so shite */ static char * unstuff_is_shit_with_filenames (const char *orig) @@ -102,7 +101,6 @@ unstuff_is_shit_with_filenames (const char *orig) return filename; } - static void process_line (char *line, gpointer data) @@ -178,7 +176,6 @@ process_line (char *line, g_free (real_filename); } - static void list__begin (gpointer data) { @@ -187,7 +184,6 @@ list__begin (gpointer data) comm->fdata = NULL; } - static void fr_command_unstuff_list (FrCommand *comm) { @@ -218,7 +214,6 @@ fr_command_unstuff_list (FrCommand *comm) fr_process_start (comm->process); } - static void fr_command_unstuff_extract (FrCommand *comm, const char *from_file, @@ -263,7 +258,6 @@ fr_command_unstuff_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_unstuff_handle_error (FrCommand *comm, FrProcError *error) @@ -275,17 +269,14 @@ fr_command_unstuff_handle_error (FrCommand *comm, } } - const char *unstuff_mime_type[] = { "application/x-stuffit", NULL }; - static const char ** fr_command_unstuff_get_mime_types (FrCommand *comm) { return unstuff_mime_type; } - static FrCommandCap fr_command_unstuff_get_capabilities (FrCommand *comm, const char *mime_type, @@ -300,7 +291,6 @@ fr_command_unstuff_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_unstaff_get_packages (FrCommand *comm, const char *mime_type) @@ -308,7 +298,6 @@ fr_command_unstaff_get_packages (FrCommand *comm, return PACKAGES ("unstaff"); } - static void fr_command_unstuff_class_init (FrCommandUnstuffClass *class) { @@ -330,7 +319,6 @@ fr_command_unstuff_class_init (FrCommandUnstuffClass *class) afc->get_packages = fr_command_unstaff_get_packages; } - static void fr_command_unstuff_init (FrCommand *comm) { @@ -343,7 +331,6 @@ fr_command_unstuff_init (FrCommand *comm) comm->propTest = FALSE; } - static void fr_command_unstuff_finalize (GObject *object) { @@ -361,7 +348,6 @@ fr_command_unstuff_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_unstuff_get_type () { diff --git a/src/fr-command-zip.c b/src/fr-command-zip.c index 9469e91..2d82c37 100644 --- a/src/fr-command-zip.c +++ b/src/fr-command-zip.c @@ -44,7 +44,6 @@ static void fr_command_zip_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ static time_t @@ -91,7 +90,6 @@ mktime_from_string (char *datetime_s) return mktime (&tm); } - static void list__process_line (char *line, gpointer data) @@ -161,7 +159,6 @@ list__process_line (char *line, fr_command_add_file (comm, fdata); } - static void add_password_arg (FrCommand *comm, const char *password) @@ -172,7 +169,6 @@ add_password_arg (FrCommand *comm, } } - static void list__begin (gpointer data) { @@ -181,7 +177,6 @@ list__begin (gpointer data) comm->is_empty = FALSE; } - static void fr_command_zip_list (FrCommand *comm) { @@ -196,7 +191,6 @@ fr_command_zip_list (FrCommand *comm) fr_process_start (comm->process); } - static void process_line__common (char *line, gpointer data) @@ -214,7 +208,6 @@ process_line__common (char *line, fr_command_message (comm, line); } - static void fr_command_zip_add (FrCommand *comm, const char *from_file, @@ -262,7 +255,6 @@ fr_command_zip_add (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_zip_delete (FrCommand *comm, const char *from_file, @@ -291,7 +283,6 @@ fr_command_zip_delete (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_zip_extract (FrCommand *comm, const char *from_file, @@ -337,7 +328,6 @@ fr_command_zip_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_zip_test (FrCommand *comm) { @@ -349,7 +339,6 @@ fr_command_zip_test (FrCommand *comm) fr_process_end_command (comm->process); } - static void fr_command_zip_handle_error (FrCommand *comm, FrProcError *error) @@ -380,7 +369,6 @@ fr_command_zip_handle_error (FrCommand *comm, } } - const char *zip_mime_type[] = { "application/epub+zip", "application/vnd.oasis.opendocument.presentation", @@ -396,7 +384,6 @@ const char *zip_mime_type[] = { "application/zip", /* zip always at the end and the number of */ NULL }; /* place in fr_command_zip_get_mime_types */ - static const char ** fr_command_zip_get_mime_types (FrCommand *comm) { @@ -414,7 +401,6 @@ fr_command_zip_get_mime_types (FrCommand *comm) return zip_mime_type; } - static FrCommandCap fr_command_zip_get_capabilities (FrCommand *comm, const char *mime_type, @@ -435,7 +421,6 @@ fr_command_zip_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_zip_get_packages (FrCommand *comm, const char *mime_type) @@ -443,7 +428,6 @@ fr_command_zip_get_packages (FrCommand *comm, return PACKAGES ("zip,unzip"); } - static void fr_command_zip_class_init (FrCommandZipClass *class) { @@ -466,7 +450,6 @@ fr_command_zip_class_init (FrCommandZipClass *class) afc->get_packages = fr_command_zip_get_packages; } - static void fr_command_zip_init (FrCommand *comm) { @@ -482,7 +465,6 @@ fr_command_zip_init (FrCommand *comm) FR_COMMAND_ZIP (comm)->is_empty = FALSE; } - static void fr_command_zip_finalize (GObject *object) { @@ -494,7 +476,6 @@ fr_command_zip_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_zip_get_type () { diff --git a/src/fr-command-zoo.c b/src/fr-command-zoo.c index 1919d3b..79a102e 100644 --- a/src/fr-command-zoo.c +++ b/src/fr-command-zoo.c @@ -40,7 +40,6 @@ static void fr_command_zoo_finalize (GObject *object); static FrCommandClass *parent_class = NULL; - /* -- list -- */ static time_t @@ -106,7 +105,6 @@ mktime_from_string_zoo (char *mday_s, return mktime (&tm); } - static char ** split_line_zoo (char *line) { @@ -147,7 +145,6 @@ split_line_zoo (char *line) return fields; } - static const char * get_last_field_zoo (char *line) { @@ -171,7 +168,6 @@ get_last_field_zoo (char *line) return field; } - static void process_zoo_line (char *line, gpointer data) @@ -218,7 +214,6 @@ process_zoo_line (char *line, fr_command_add_file (zoo_comm, fdata); } - static void fr_command_zoo_list (FrCommand *zoo_comm) { @@ -231,7 +226,6 @@ fr_command_zoo_list (FrCommand *zoo_comm) fr_process_start (zoo_comm->process); } - static void fr_command_zoo_add (FrCommand *comm, const char *from_file, @@ -260,7 +254,6 @@ fr_command_zoo_add (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_zoo_delete (FrCommand *comm, const char *from_file, @@ -279,7 +272,6 @@ fr_command_zoo_delete (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_zoo_extract (FrCommand *comm, const char *from_file, @@ -309,7 +301,6 @@ fr_command_zoo_extract (FrCommand *comm, fr_process_end_command (comm->process); } - static void fr_command_zoo_test (FrCommand *comm) { @@ -319,17 +310,14 @@ fr_command_zoo_test (FrCommand *comm) fr_process_end_command (comm->process); } - const char *zoo_mime_type[] = { "application/x-zoo", NULL }; - static const char ** fr_command_zoo_get_mime_types (FrCommand *comm) { return zoo_mime_type; } - static FrCommandCap fr_command_zoo_get_capabilities (FrCommand *comm, const char *mime_type, @@ -344,7 +332,6 @@ fr_command_zoo_get_capabilities (FrCommand *comm, return capabilities; } - static const char * fr_command_zoo_get_packages (FrCommand *comm, const char *mime_type) @@ -352,7 +339,6 @@ fr_command_zoo_get_packages (FrCommand *comm, return PACKAGES ("zoo"); } - static void fr_command_zoo_class_init (FrCommandZooClass *class) { @@ -374,7 +360,6 @@ fr_command_zoo_class_init (FrCommandZooClass *class) afc->get_packages = fr_command_zoo_get_packages; } - static void fr_command_zoo_init (FrCommand *comm) { @@ -387,7 +372,6 @@ fr_command_zoo_init (FrCommand *comm) comm->propTest = TRUE; } - static void fr_command_zoo_finalize (GObject *object) { @@ -399,7 +383,6 @@ fr_command_zoo_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - GType fr_command_zoo_get_type () { diff --git a/src/fr-command.c b/src/fr-command.c index 163f277..255a229 100644 --- a/src/fr-command.c +++ b/src/fr-command.c @@ -36,7 +36,6 @@ #define INITIAL_SIZE 256 - /* Signals */ enum { START, @@ -115,13 +114,11 @@ fr_command_get_type () return type; } - static void base_fr_command_list (FrCommand *comm) { } - static void base_fr_command_add (FrCommand *comm, const char *from_file, @@ -132,7 +129,6 @@ base_fr_command_add (FrCommand *comm, { } - static void base_fr_command_delete (FrCommand *comm, const char *from_file, @@ -140,7 +136,6 @@ base_fr_command_delete (FrCommand *comm, { } - static void base_fr_command_extract (FrCommand *comm, const char *from_file, @@ -152,42 +147,35 @@ base_fr_command_extract (FrCommand *comm, { } - static void base_fr_command_test (FrCommand *comm) { } - static void base_fr_command_uncompress (FrCommand *comm) { } - static void base_fr_command_recompress (FrCommand *comm) { } - static void base_fr_command_handle_error (FrCommand *comm, FrProcError *error) { } - const char **void_mime_types = { NULL }; - static const char ** base_fr_command_get_mime_types (FrCommand *comm) { return void_mime_types; } - static FrCommandCap base_fr_command_get_capabilities (FrCommand *comm, const char *mime_type, @@ -196,7 +184,6 @@ base_fr_command_get_capabilities (FrCommand *comm, return FR_COMMAND_CAN_DO_NOTHING; } - static void base_fr_command_set_mime_type (FrCommand *comm, const char *mime_type) @@ -205,7 +192,6 @@ base_fr_command_set_mime_type (FrCommand *comm, fr_command_update_capabilities (comm); } - static const char * base_fr_command_get_packages (FrCommand *comm, const char *mime_type) @@ -213,7 +199,6 @@ base_fr_command_get_packages (FrCommand *comm, return NULL; } - static void fr_command_start (FrProcess *process, gpointer data) @@ -226,7 +211,6 @@ fr_command_start (FrProcess *process, comm->action); } - static void fr_command_done (FrProcess *process, FrProcError *error, @@ -255,7 +239,6 @@ fr_command_done (FrProcess *process, error); } - static void fr_command_set_process (FrCommand *comm, FrProcess *process) @@ -286,7 +269,6 @@ fr_command_set_process (FrCommand *comm, comm); } - static void fr_command_set_property (GObject *object, guint prop_id, @@ -325,7 +307,6 @@ fr_command_set_property (GObject *object, } } - static void fr_command_get_property (GObject *object, guint prop_id, @@ -364,7 +345,6 @@ fr_command_get_property (GObject *object, } } - static void fr_command_class_init (FrCommandClass *class) { @@ -502,7 +482,6 @@ fr_command_class_init (FrCommandClass *class) G_PARAM_READWRITE)); } - static void fr_command_init (FrCommand *comm) { @@ -530,7 +509,6 @@ fr_command_init (FrCommand *comm) comm->propListFromFile = FALSE; } - static void fr_command_finalize (GObject *object) { @@ -553,7 +531,6 @@ fr_command_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - static void fr_command_set_filename (FrCommand *comm, const char *filename) @@ -593,7 +570,6 @@ fr_command_set_filename (FrCommand *comm, fr_command_working_archive (comm, comm->filename); } - void fr_command_set_file (FrCommand *comm, GFile *file) @@ -606,7 +582,6 @@ fr_command_set_file (FrCommand *comm, g_free (filename); } - void fr_command_set_multi_volume (FrCommand *comm, GFile *file) @@ -615,7 +590,6 @@ fr_command_set_multi_volume (FrCommand *comm, fr_command_set_file (comm, file); } - void fr_command_list (FrCommand *comm) { @@ -644,7 +618,6 @@ fr_command_list (FrCommand *comm) &comm->process->error); } - void fr_command_add (FrCommand *comm, const char *from_file, @@ -667,7 +640,6 @@ fr_command_add (FrCommand *comm, recursive); } - void fr_command_delete (FrCommand *comm, const char *from_file, @@ -682,7 +654,6 @@ fr_command_delete (FrCommand *comm, FR_COMMAND_GET_CLASS (G_OBJECT (comm))->delete (comm, from_file, file_list); } - void fr_command_extract (FrCommand *comm, const char *from_file, @@ -707,7 +678,6 @@ fr_command_extract (FrCommand *comm, junk_paths); } - void fr_command_test (FrCommand *comm) { @@ -720,7 +690,6 @@ fr_command_test (FrCommand *comm) FR_COMMAND_GET_CLASS (G_OBJECT (comm))->test (comm); } - void fr_command_uncompress (FrCommand *comm) { @@ -728,7 +697,6 @@ fr_command_uncompress (FrCommand *comm) FR_COMMAND_GET_CLASS (G_OBJECT (comm))->uncompress (comm); } - void fr_command_recompress (FrCommand *comm) { @@ -736,21 +704,18 @@ fr_command_recompress (FrCommand *comm) FR_COMMAND_GET_CLASS (G_OBJECT (comm))->recompress (comm); } - const char ** fr_command_get_mime_types (FrCommand *comm) { return FR_COMMAND_GET_CLASS (G_OBJECT (comm))->get_mime_types (comm); } - void fr_command_update_capabilities (FrCommand *comm) { comm->capabilities = fr_command_get_capabilities (comm, comm->mime_type, TRUE); } - FrCommandCap fr_command_get_capabilities (FrCommand *comm, const char *mime_type, @@ -759,7 +724,6 @@ fr_command_get_capabilities (FrCommand *comm, return FR_COMMAND_GET_CLASS (G_OBJECT (comm))->get_capabilities (comm, mime_type, check_command); } - gboolean fr_command_is_capable_of (FrCommand *comm, FrCommandCaps requested_capabilities) @@ -767,7 +731,6 @@ fr_command_is_capable_of (FrCommand *comm, return (((comm->capabilities ^ requested_capabilities) & requested_capabilities) == 0); } - const char * fr_command_get_packages (FrCommand *comm, const char *mime_type) @@ -775,7 +738,6 @@ fr_command_get_packages (FrCommand *comm, return FR_COMMAND_GET_CLASS (G_OBJECT (comm))->get_packages (comm, mime_type); } - /* fraction == -1 means : I don't known how much time the current operation * will take, the dialog will display this info pulsing * the progress bar. @@ -792,7 +754,6 @@ fr_command_progress (FrCommand *comm, fraction); } - void fr_command_message (FrCommand *comm, const char *msg) @@ -803,7 +764,6 @@ fr_command_message (FrCommand *comm, msg); } - void fr_command_working_archive (FrCommand *comm, const char *archive_name) @@ -814,7 +774,6 @@ fr_command_working_archive (FrCommand *comm, archive_name); } - void fr_command_set_n_files (FrCommand *comm, int n_files) @@ -823,7 +782,6 @@ fr_command_set_n_files (FrCommand *comm, comm->n_file = 0; } - void fr_command_add_file (FrCommand *comm, FileData *fdata) @@ -834,7 +792,6 @@ fr_command_add_file (FrCommand *comm, comm->n_regular_files++; } - void fr_command_set_mime_type (FrCommand *comm, const char *mime_type) @@ -842,7 +799,6 @@ fr_command_set_mime_type (FrCommand *comm, FR_COMMAND_GET_CLASS (G_OBJECT (comm))->set_mime_type (comm, mime_type); } - void fr_command_handle_error (FrCommand *comm, FrProcError *error) diff --git a/src/fr-error.c b/src/fr-error.c index efeb5d7..c7767b5 100644 --- a/src/fr-error.c +++ b/src/fr-error.c @@ -20,10 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - #include "fr-error.h" - GQuark fr_error_quark (void) { diff --git a/src/fr-error.h b/src/fr-error.h index 26f2c13..8c2319e 100644 --- a/src/fr-error.h +++ b/src/fr-error.h @@ -28,5 +28,4 @@ #define FR_ERROR fr_error_quark () GQuark fr_error_quark (void); - #endif /* __FR_ERROR_H__ */ diff --git a/src/fr-init.c b/src/fr-init.c index 7d7b313..256e13e 100644 --- a/src/fr-init.c +++ b/src/fr-init.c @@ -54,7 +54,6 @@ #include "typedefs.h" #include "preferences.h" - /* The capabilities are computed automatically in * compute_supported_archive_types() so it's correct to initialize to 0 here. */ FrMimeTypeDescription mime_type_desc[] = { @@ -189,7 +188,6 @@ FrExtensionType file_ext_type[] = { { NULL, NULL } }; - GList *CommandList; gint ForceDirectoryCreation; GHashTable *ProgramsCache; @@ -199,7 +197,6 @@ int save_type[G_N_ELEMENTS (mime_type_desc)]; int open_type[G_N_ELEMENTS (mime_type_desc)]; int create_type[G_N_ELEMENTS (mime_type_desc)]; - static void migrate_options_directory (void) { @@ -225,10 +222,8 @@ migrate_options_directory (void) g_free (old_directory_path); } - /* -- FrRegisteredCommand -- */ - static FrRegisteredCommand * fr_registered_command_new (GType command_type) { @@ -269,14 +264,12 @@ fr_registered_command_new (GType command_type) return reg_com; } - G_GNUC_UNUSED static void fr_registered_command_ref (FrRegisteredCommand *reg_com) { reg_com->ref++; } - static void fr_registered_command_unref (FrRegisteredCommand *reg_com) { @@ -288,7 +281,6 @@ fr_registered_command_unref (FrRegisteredCommand *reg_com) g_free (reg_com); } - static FrCommandCaps fr_registered_command_get_capabilities (FrRegisteredCommand *reg_com, const char *mime_type) @@ -306,7 +298,6 @@ fr_registered_command_get_capabilities (FrRegisteredCommand *reg_com, return FR_COMMAND_CAN_DO_NOTHING; } - static FrCommandCaps fr_registered_command_get_potential_capabilities (FrRegisteredCommand *reg_com, const char *mime_type) @@ -327,7 +318,6 @@ fr_registered_command_get_potential_capabilities (FrRegisteredCommand *reg_com, return FR_COMMAND_CAN_DO_NOTHING; } - static void register_command (GType command_type) { @@ -336,7 +326,6 @@ register_command (GType command_type) g_ptr_array_add (Registered_Commands, fr_registered_command_new (command_type)); } - G_GNUC_UNUSED static gboolean unregister_command (GType command_type) { @@ -356,7 +345,6 @@ unregister_command (GType command_type) return FALSE; } - static void register_commands (void) { @@ -390,7 +378,6 @@ register_commands (void) #endif } - GType get_command_type_from_mime_type (const char *mime_type, FrCommandCaps requested_capabilities) @@ -415,7 +402,6 @@ get_command_type_from_mime_type (const char *mime_type, return 0; } - GType get_preferred_command_for_mime_type (const char *mime_type, FrCommandCaps requested_capabilities) @@ -437,7 +423,6 @@ get_preferred_command_for_mime_type (const char *mime_type, return 0; } - void update_registered_commands_capabilities (void) { @@ -463,7 +448,6 @@ update_registered_commands_capabilities (void) } } - const char * get_mime_type_from_extension (const char *ext) { @@ -482,7 +466,6 @@ get_mime_type_from_extension (const char *ext) return NULL; } - const char * get_archive_filename_extension (const char *filename) { @@ -529,7 +512,6 @@ get_mime_type_index (const char *mime_type) return -1; } - static void add_if_non_present (int *a, int *n, @@ -545,7 +527,6 @@ add_if_non_present (int *a, *n = *n + 1; } - static int cmp_mime_type_by_extension (const void *p1, const void *p2) @@ -556,7 +537,6 @@ cmp_mime_type_by_extension (const void *p1, return strcmp (mime_type_desc[i1].default_ext, mime_type_desc[i2].default_ext); } - static int cmp_mime_type_by_description (const void *p1, const void *p2) @@ -567,7 +547,6 @@ cmp_mime_type_by_description (const void *p1, return g_utf8_collate (_(mime_type_desc[i1].name), _(mime_type_desc[i2].name)); } - static void sort_mime_types (int *a, int(*compar)(const void *, const void *)) @@ -579,21 +558,18 @@ sort_mime_types (int *a, qsort (a, n, sizeof (int), compar); } - void sort_mime_types_by_extension (int *a) { sort_mime_types (a, cmp_mime_type_by_extension); } - void sort_mime_types_by_description (int *a) { sort_mime_types (a, cmp_mime_type_by_description); } - static void compute_supported_archive_types (void) { @@ -637,7 +613,6 @@ compute_supported_archive_types (void) create_type[c_i] = -1; } - static gboolean initialized = FALSE; void @@ -657,7 +632,6 @@ initialize_data (void) compute_supported_archive_types (); } - static void command_done (CommandData *cdata) { @@ -690,7 +664,6 @@ command_done (CommandData *cdata) g_free (cdata); } - void release_data (void) { diff --git a/src/fr-list-model.c b/src/fr-list-model.c index 78b8f1d..cd4efa2 100644 --- a/src/fr-list-model.c +++ b/src/fr-list-model.c @@ -25,10 +25,8 @@ #include "fr-list-model.h" #include "fr-window.h" - static GtkListStoreClass *parent_class; - static gboolean fr_list_model_multi_row_draggable (EggTreeMultiDragSource *drag_source, GList *path_list) @@ -66,7 +64,6 @@ fr_list_model_multi_row_draggable (EggTreeMultiDragSource *drag_source, return FALSE; } - static gboolean fr_list_model_multi_drag_data_get (EggTreeMultiDragSource *drag_source, GdkDragContext *context, @@ -84,7 +81,6 @@ fr_list_model_multi_drag_data_get (EggTreeMultiDragSource *drag_source, path_list); } - static gboolean fr_list_model_multi_drag_data_delete (EggTreeMultiDragSource *drag_source, GList *path_list) @@ -92,7 +88,6 @@ fr_list_model_multi_drag_data_delete (EggTreeMultiDragSource *drag_source, return TRUE; } - static void fr_list_model_finalize (GObject *object) { @@ -100,13 +95,11 @@ fr_list_model_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - static void fr_list_model_init (FRListModel *model) { } - static void fr_list_model_class_init (FRListModelClass *klass) { @@ -118,8 +111,6 @@ fr_list_model_class_init (FRListModelClass *klass) object_class->finalize = fr_list_model_finalize; } - - static void fr_list_model_multi_drag_source_init (EggTreeMultiDragSourceIface *iface) { @@ -128,7 +119,6 @@ fr_list_model_multi_drag_source_init (EggTreeMultiDragSourceIface *iface) iface->drag_data_delete = fr_list_model_multi_drag_data_delete; } - GType fr_list_model_get_type (void) { @@ -163,7 +153,6 @@ fr_list_model_get_type (void) return object_type; } - GtkListStore * fr_list_model_new (int n_columns, ...) { diff --git a/src/fr-proc-error.c b/src/fr-proc-error.c index 1f61613..ce20752 100644 --- a/src/fr-proc-error.c +++ b/src/fr-proc-error.c @@ -22,7 +22,6 @@ #include <config.h> #include "fr-proc-error.h" - static gpointer fr_proc_error_copy (gpointer boxed) { @@ -37,7 +36,6 @@ fr_proc_error_copy (gpointer boxed) return new_error; } - static void fr_proc_error_free (gpointer boxed) { @@ -48,7 +46,6 @@ fr_proc_error_free (gpointer boxed) g_free (error); } - G_DEFINE_BOXED_TYPE (FrProcError, fr_proc_error, fr_proc_error_copy, diff --git a/src/fr-process.c b/src/fr-process.c index 892aaae..1ee9d8d 100644 --- a/src/fr-process.c +++ b/src/fr-process.c @@ -53,7 +53,6 @@ static void fr_process_class_init (FrProcessClass *class); static void fr_process_init (FrProcess *process); static void fr_process_finalize (GObject *object); - typedef struct { GList *args; /* command to execute */ char *dir; /* working directory */ @@ -71,7 +70,6 @@ typedef struct { gpointer end_data; } FrCommandInfo; - static FrCommandInfo * fr_command_info_new (void) { @@ -86,7 +84,6 @@ fr_command_info_new (void) return info; } - static void fr_command_info_free (FrCommandInfo *info) { @@ -106,7 +103,6 @@ fr_command_info_free (FrCommandInfo *info) g_free (info); } - static void fr_channel_data_init (FrChannelData *channel) { @@ -116,7 +112,6 @@ fr_channel_data_init (FrChannelData *channel) channel->error = NULL; } - static void fr_channel_data_close_source (FrChannelData *channel) { @@ -127,7 +122,6 @@ fr_channel_data_close_source (FrChannelData *channel) } } - static GIOStatus fr_channel_data_read (FrChannelData *channel) { @@ -153,7 +147,6 @@ fr_channel_data_read (FrChannelData *channel) return channel->status; } - static GIOStatus fr_channel_data_flush (FrChannelData *channel) { @@ -166,7 +159,6 @@ fr_channel_data_flush (FrChannelData *channel) return status; } - static void fr_channel_data_reset (FrChannelData *channel) { @@ -178,14 +170,12 @@ fr_channel_data_reset (FrChannelData *channel) } } - static void fr_channel_data_free (FrChannelData *channel) { fr_channel_data_reset (channel); } - static void fr_channel_data_set_fd (FrChannelData *channel, int fd, @@ -200,11 +190,9 @@ fr_channel_data_set_fd (FrChannelData *channel, g_io_channel_set_encoding (channel->source, charset, NULL); } - const char *try_charsets[] = { "UTF-8", "ISO-8859-1", "WINDOW-1252" }; int n_charsets = G_N_ELEMENTS (try_charsets); - struct _FrProcessPrivate { GPtrArray *comm; /* FrCommandInfo elements. */ gint n_comm; /* total number of commands */ @@ -227,7 +215,6 @@ struct _FrProcessPrivate { int current_charset; }; - GType fr_process_get_type (void) { @@ -256,7 +243,6 @@ fr_process_get_type (void) return type; } - static void fr_process_class_init (FrProcessClass *class) { @@ -296,7 +282,6 @@ fr_process_class_init (FrProcessClass *class) class->done = NULL; } - static void fr_process_init (FrProcess *process) { @@ -325,14 +310,12 @@ fr_process_init (FrProcess *process) process->priv->use_standard_locale = FALSE; } - FrProcess * fr_process_new (void) { return FR_PROCESS (g_object_new (FR_TYPE_PROCESS, NULL)); } - static void fr_process_stop_priv (FrProcess *process, gboolean emit_signal); static int fr_switch_process_state (FrProcess *process); @@ -365,7 +348,6 @@ fr_process_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - void fr_process_begin_command (FrProcess *process, const char *arg) @@ -383,7 +365,6 @@ fr_process_begin_command (FrProcess *process, process->priv->current_comm = process->priv->n_comm; } - void fr_process_begin_command_at (FrProcess *process, const char *arg, @@ -407,7 +388,6 @@ fr_process_begin_command_at (FrProcess *process, g_ptr_array_index (process->priv->comm, index) = info; } - void fr_process_set_working_dir (FrProcess *process, const char *dir) @@ -423,7 +403,6 @@ fr_process_set_working_dir (FrProcess *process, info->dir = g_strdup (dir); } - void fr_process_set_sticky (FrProcess *process, gboolean sticky) @@ -437,7 +416,6 @@ fr_process_set_sticky (FrProcess *process, info->sticky = sticky; } - void fr_process_set_ignore_error (FrProcess *process, gboolean ignore_error) @@ -451,7 +429,6 @@ fr_process_set_ignore_error (FrProcess *process, info->ignore_error = ignore_error; } - void fr_process_add_arg (FrProcess *process, const char *arg) @@ -465,7 +442,6 @@ fr_process_add_arg (FrProcess *process, info->args = g_list_prepend (info->args, g_strdup (arg)); } - void fr_process_add_arg_concat (FrProcess *process, const char *arg1, @@ -486,7 +462,6 @@ fr_process_add_arg_concat (FrProcess *process, g_string_free (arg, TRUE); } - void fr_process_add_arg_printf (FrProcess *fr_proc, const char *format, @@ -504,7 +479,6 @@ fr_process_add_arg_printf (FrProcess *fr_proc, g_free (arg); } - void fr_process_set_arg_at (FrProcess *process, int n_comm, @@ -524,7 +498,6 @@ fr_process_set_arg_at (FrProcess *process, arg->data = g_strdup (arg_value); } - void fr_process_set_begin_func (FrProcess *process, ProcFunc func, @@ -539,7 +512,6 @@ fr_process_set_begin_func (FrProcess *process, info->begin_data = func_data; } - void fr_process_set_end_func (FrProcess *process, ProcFunc func, @@ -554,7 +526,6 @@ fr_process_set_end_func (FrProcess *process, info->end_data = func_data; } - void fr_process_set_continue_func (FrProcess *process, ContinueFunc func, @@ -572,7 +543,6 @@ fr_process_set_continue_func (FrProcess *process, info->continue_data = func_data; } - void fr_process_end_command (FrProcess *process) { @@ -584,7 +554,6 @@ fr_process_end_command (FrProcess *process) info->args = g_list_reverse (info->args); } - void fr_process_clear (FrProcess *process) { @@ -607,7 +576,6 @@ fr_process_clear (FrProcess *process) process->priv->current_comm = -1; } - void fr_process_set_out_line_func (FrProcess *process, LineFunc func, @@ -619,7 +587,6 @@ fr_process_set_out_line_func (FrProcess *process, process->out.line_data = data; } - void fr_process_set_err_line_func (FrProcess *process, LineFunc func, @@ -631,10 +598,8 @@ fr_process_set_err_line_func (FrProcess *process, process->err.line_data = data; } - static gboolean check_child (gpointer data); - static void child_setup (gpointer user_data) { @@ -656,7 +621,6 @@ child_setup (gpointer user_data) setpgid (0, 0); } - static const char * fr_process_get_charset (FrProcess *process) { @@ -670,7 +634,6 @@ fr_process_get_charset (FrProcess *process) return charset; } - static void start_current_command (FrProcess *process) { @@ -804,7 +767,6 @@ start_current_command (FrProcess *process) process); } - static gboolean command_is_sticky (FrProcess *process, int i) @@ -815,7 +777,6 @@ command_is_sticky (FrProcess *process, return info->sticky; } - static void allow_sticky_processes_only (FrProcess *process, gboolean emit_signal) @@ -837,7 +798,6 @@ allow_sticky_processes_only (FrProcess *process, 0); } - static void fr_process_set_error (FrProcess *process, FrProcErrorType type, @@ -853,7 +813,6 @@ fr_process_set_error (FrProcess *process, } } - static gint check_child (gpointer data) { @@ -1008,7 +967,6 @@ check_child (gpointer data) return FALSE; } - void fr_process_use_standard_locale (FrProcess *process, gboolean use_stand_locale) @@ -1017,7 +975,6 @@ fr_process_use_standard_locale (FrProcess *process, process->priv->use_standard_locale = use_stand_locale; } - void fr_process_start (FrProcess *process) { @@ -1141,7 +1098,6 @@ fr_process_stop_priv (FrProcess *process, } } - void fr_process_stop (FrProcess *process) { 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, diff --git a/src/fr-window.h b/src/fr-window.h index 13b8bd9..f56f860 100644 --- a/src/fr-window.h +++ b/src/fr-window.h @@ -28,7 +28,6 @@ #include "typedefs.h" #include "fr-archive.h" - enum { COLUMN_FILE_DATA, COLUMN_ICON, diff --git a/src/gio-utils.c b/src/gio-utils.c index b1acd3d..5f66e1f 100644 --- a/src/gio-utils.c +++ b/src/gio-utils.c @@ -27,13 +27,10 @@ #include "file-utils.h" #include "gio-utils.h" - #define N_FILES_PER_REQUEST 128 - /* -- filter -- */ - typedef enum { FILTER_DEFAULT = 0, FILTER_NODOTFILES = 1 << 1, @@ -41,14 +38,12 @@ typedef enum { FILTER_NOBACKUPFILES = 1 << 3 } FilterOptions; - typedef struct { char *pattern; FilterOptions options; GRegex **regexps; } Filter; - static Filter * filter_new (const char *pattern, FilterOptions options) @@ -71,7 +66,6 @@ filter_new (const char *pattern, return filter; } - static void filter_destroy (Filter *filter) { @@ -84,7 +78,6 @@ filter_destroy (Filter *filter) g_free (filter); } - static gboolean filter_matches (Filter *filter, const char *name) @@ -115,17 +108,14 @@ filter_matches (Filter *filter, return matched; } - static gboolean filter_empty (Filter *filter) { return ((filter->pattern == NULL) || (strcmp (filter->pattern, "*") == 0)); } - /* -- g_directory_foreach_child -- */ - typedef struct { GFile *base_directory; gboolean recursive; @@ -146,7 +136,6 @@ typedef struct { guint source_id; } ForEachChildData; - static void for_each_child_data_free (ForEachChildData *fec) { @@ -164,7 +153,6 @@ for_each_child_data_free (ForEachChildData *fec) g_free (fec); } - static gboolean for_each_child_done_cb (gpointer user_data) { @@ -182,17 +170,14 @@ for_each_child_done_cb (gpointer user_data) return FALSE; } - static void for_each_child_done (ForEachChildData *fec) { fec->source_id = g_idle_add (for_each_child_done_cb, fec); } - static void for_each_child_start_current (ForEachChildData *fec); - static gboolean for_each_child_start_cb (gpointer user_data) { @@ -204,14 +189,12 @@ for_each_child_start_cb (gpointer user_data) return FALSE; } - static void for_each_child_start (ForEachChildData *fec) { fec->source_id = g_idle_add (for_each_child_start_cb, fec); } - static void for_each_child_set_current_uri (ForEachChildData *fec, const char *directory) @@ -221,7 +204,6 @@ for_each_child_set_current_uri (ForEachChildData *fec, fec->current = g_file_new_for_uri (directory); } - static void for_each_child_set_current (ForEachChildData *fec, GFile *directory) @@ -253,7 +235,6 @@ for_each_child_start_next_sub_directory (ForEachChildData *fec) for_each_child_done (fec); } - static void for_each_child_close_enumerator (GObject *source_object, GAsyncResult *result, @@ -278,7 +259,6 @@ for_each_child_close_enumerator (GObject *source_object, for_each_child_done (fec); } - static void for_each_child_next_files_ready (GObject *source_object, GAsyncResult *result, @@ -355,7 +335,6 @@ for_each_child_ready (GObject *source_object, fec); } - static void for_each_child_start_current (ForEachChildData *fec) { @@ -444,10 +423,8 @@ g_directory_foreach_child (GFile *directory, for_each_child_start_current (fec); } - /* -- get_file_list_data -- */ - typedef struct { GList *files; GList *dirs; @@ -464,7 +441,6 @@ typedef struct { guint visit_timeout; } GetFileListData; - static void get_file_list_data_free (GetFileListData *gfl) { @@ -484,10 +460,8 @@ get_file_list_data_free (GetFileListData *gfl) g_free (gfl); } - /* -- g_directory_list_async -- */ - static GList* get_relative_file_list (GList *rel_list, GList *file_list, @@ -513,7 +487,6 @@ get_relative_file_list (GList *rel_list, return rel_list; } - static GList* get_dir_list_from_file_list (GHashTable *h_dirs, const char *base_dir, @@ -565,7 +538,6 @@ get_dir_list_from_file_list (GHashTable *h_dirs, return dir_list; } - static void get_file_list_done (GError *error, gpointer user_data) @@ -636,7 +608,6 @@ get_file_list_done (GError *error, get_file_list_data_free (gfl); } - static void get_file_list_for_each_file (const char *uri, GFileInfo *info, @@ -655,7 +626,6 @@ get_file_list_for_each_file (const char *uri, } } - static DirOp get_file_list_start_dir (const char *uri, GError **error, @@ -671,7 +641,6 @@ get_file_list_start_dir (const char *uri, return DIR_OP_SKIP; } - void g_directory_list_async (const char *directory, const char *base_dir, @@ -717,13 +686,10 @@ g_directory_list_async (const char *directory, gfl); } - /* -- g_list_items_async -- */ - static void get_items_for_current_dir (GetFileListData *gfl); - static gboolean get_items_for_next_dir_idle_cb (gpointer data) { @@ -738,7 +704,6 @@ get_items_for_next_dir_idle_cb (gpointer data) return FALSE; } - static void get_items_for_current_dir_done (GList *files, GList *dirs, @@ -762,7 +727,6 @@ get_items_for_current_dir_done (GList *files, gfl->visit_timeout = g_idle_add (get_items_for_next_dir_idle_cb, gfl); } - static void get_items_for_current_dir (GetFileListData *gfl) { @@ -803,7 +767,6 @@ get_items_for_current_dir (GetFileListData *gfl) g_object_unref (current_dir); } - void g_list_items_async (GList *items, const char *base_dir, @@ -844,10 +807,8 @@ g_list_items_async (GList *items, get_items_for_current_dir (gfl); } - /* -- g_copy_files_async -- */ - typedef struct { GList *sources; GList *destinations; @@ -865,7 +826,6 @@ typedef struct { int tot_files; } CopyFilesData; - static CopyFilesData* copy_files_data_new (GList *sources, GList *destinations, @@ -898,7 +858,6 @@ copy_files_data_new (GList *sources, return cfd; } - static void copy_files_data_free (CopyFilesData *cfd) { @@ -909,10 +868,8 @@ copy_files_data_free (CopyFilesData *cfd) g_free (cfd); } - static void g_copy_current_file (CopyFilesData *cfd); - static void g_copy_next_file (CopyFilesData *cfd) { @@ -923,7 +880,6 @@ g_copy_next_file (CopyFilesData *cfd) g_copy_current_file (cfd); } - static void g_copy_files_ready_cb (GObject *source_object, GAsyncResult *result, @@ -957,7 +913,6 @@ g_copy_files_ready_cb (GObject *source_object, g_copy_next_file (cfd); } - static void g_copy_files_progress_cb (goffset current_num_bytes, goffset total_num_bytes, @@ -975,7 +930,6 @@ g_copy_files_progress_cb (goffset current_num_bytes, cfd->progress_callback_data); } - static void g_copy_current_file (CopyFilesData *cfd) { @@ -997,7 +951,6 @@ g_copy_current_file (CopyFilesData *cfd) cfd); } - void g_copy_files_async (GList *sources, GList *destinations, @@ -1023,7 +976,6 @@ g_copy_files_async (GList *sources, g_copy_current_file (cfd); } - void g_copy_file_async (GFile *source, GFile *destination, @@ -1055,16 +1007,13 @@ g_copy_file_async (GFile *source, g_list_free (destination_files); } - /* -- g_directory_copy_async -- */ - typedef struct { char *uri; GFileInfo *info; } ChildData; - static ChildData* child_data_new (const char *uri, GFileInfo *info) @@ -1078,7 +1027,6 @@ child_data_new (const char *uri, return data; } - static void child_data_free (ChildData *child) { @@ -1089,7 +1037,6 @@ child_data_free (ChildData *child) g_free (child); } - typedef struct { GFile *source; GFile *destination; @@ -1110,7 +1057,6 @@ typedef struct { guint source_id; } DirectoryCopyData; - static void directory_copy_data_free (DirectoryCopyData *dcd) { @@ -1133,7 +1079,6 @@ directory_copy_data_free (DirectoryCopyData *dcd) g_free (dcd); } - static gboolean g_directory_copy_done (gpointer user_data) { @@ -1150,7 +1095,6 @@ g_directory_copy_done (gpointer user_data) return FALSE; } - static GFile * get_destination_for_uri (DirectoryCopyData *dcd, const char *uri) @@ -1172,10 +1116,8 @@ get_destination_for_uri (DirectoryCopyData *dcd, return destination_file; } - static void g_directory_copy_current_child (DirectoryCopyData *dcd); - static gboolean g_directory_copy_next_child (gpointer user_data) { @@ -1190,7 +1132,6 @@ g_directory_copy_next_child (gpointer user_data) return FALSE; } - static void g_directory_copy_child_done_cb (GObject *source_object, GAsyncResult *result, @@ -1206,7 +1147,6 @@ g_directory_copy_child_done_cb (GObject *source_object, dcd->source_id = g_idle_add (g_directory_copy_next_child, dcd); } - static void g_directory_copy_child_progress_cb (goffset current_num_bytes, goffset total_num_bytes, @@ -1224,7 +1164,6 @@ g_directory_copy_child_progress_cb (goffset current_num_bytes, dcd->progress_callback_data); } - static void g_directory_copy_current_child (DirectoryCopyData *dcd) { @@ -1312,7 +1251,6 @@ g_directory_copy_current_child (DirectoryCopyData *dcd) dcd->source_id = g_idle_add (g_directory_copy_next_child, dcd); } - static gboolean g_directory_copy_start_copying (gpointer user_data) { @@ -1328,7 +1266,6 @@ g_directory_copy_start_copying (gpointer user_data) return FALSE; } - static void g_directory_copy_list_ready (GError *error, gpointer user_data) @@ -1344,7 +1281,6 @@ g_directory_copy_list_ready (GError *error, dcd->source_id = g_idle_add (g_directory_copy_start_copying, dcd); } - static void g_directory_copy_for_each_file (const char *uri, GFileInfo *info, @@ -1356,7 +1292,6 @@ g_directory_copy_for_each_file (const char *uri, dcd->tot_files++; } - static DirOp g_directory_copy_start_dir (const char *uri, GError **error, @@ -1375,7 +1310,6 @@ g_directory_copy_start_dir (const char *uri, return DIR_OP_CONTINUE; } - void g_directory_copy_async (const char *source, const char *destination, @@ -1411,7 +1345,6 @@ g_directory_copy_async (const char *source, dcd); } - gboolean g_load_file_in_buffer (GFile *file, void *buffer, diff --git a/src/glib-utils.c b/src/glib-utils.c index f17ddb2..e120f88 100644 --- a/src/glib-utils.c +++ b/src/glib-utils.c @@ -29,13 +29,10 @@ #include <glib-object.h> #include "glib-utils.h" - #define MAX_PATTERNS 128 - /* gobject utils*/ - void _g_object_unref (gpointer object) { @@ -43,7 +40,6 @@ _g_object_unref (gpointer object) g_object_unref (object); } - /* string utils */ gboolean @@ -57,7 +53,6 @@ strchrs (const char *str, return FALSE; } - char * str_substitute (const char *str, const char *from_str, @@ -90,7 +85,6 @@ str_substitute (const char *str, return g_string_free (gstr, FALSE); } - int strcmp_null_tolerant (const char *s1, const char *s2) { @@ -104,7 +98,6 @@ strcmp_null_tolerant (const char *s1, const char *s2) return strcmp (s1, s2); } - /* counts how many characters to escape in @str. */ static int count_chars_to_escape (const char *str, @@ -125,7 +118,6 @@ count_chars_to_escape (const char *str, return n; } - char* escape_str_common (const char *str, const char *meta_chars, @@ -166,7 +158,6 @@ escape_str_common (const char *str, return escaped; } - /* escape with backslash the string @str. */ char* escape_str (const char *str, @@ -175,7 +166,6 @@ escape_str (const char *str, return escape_str_common (str, meta_chars, '\\', 0); } - static const char * g_utf8_strstr (const char *haystack, const char *needle) { @@ -195,7 +185,6 @@ g_utf8_strstr (const char *haystack, const char *needle) return NULL; } - static char** g_utf8_strsplit (const char *string, const char *delimiter, @@ -249,7 +238,6 @@ g_utf8_strsplit (const char *string, return str_array; } - static char* g_utf8_strchug (char *string) { @@ -270,7 +258,6 @@ g_utf8_strchug (char *string) return string; } - static char* g_utf8_strchomp (char *string) { @@ -298,10 +285,8 @@ g_utf8_strchomp (char *string) return string; } - #define g_utf8_strstrip(string) g_utf8_strchomp (g_utf8_strchug (string)) - gboolean match_regexps (GRegex **regexps, const char *string, @@ -326,7 +311,6 @@ match_regexps (GRegex **regexps, return matched; } - void free_regexps (GRegex **regexps) { @@ -340,7 +324,6 @@ free_regexps (GRegex **regexps) g_free (regexps); } - char ** search_util_get_patterns (const char *pattern_string) { @@ -365,7 +348,6 @@ search_util_get_patterns (const char *pattern_string) return patterns; } - GRegex ** search_util_get_regexps (const char *pattern_string, GRegexCompileFlags compile_options) @@ -389,7 +371,6 @@ search_util_get_regexps (const char *pattern_string, return regexps; } - const char * eat_spaces (const char *line) { @@ -400,7 +381,6 @@ eat_spaces (const char *line) return line; } - char ** split_line (const char *line, int n_fields) @@ -428,7 +408,6 @@ split_line (const char *line, return fields; } - const char * get_last_field (const char *line, int last_field) @@ -451,7 +430,6 @@ get_last_field (const char *line, return field; } - void debug (const char *file, int line, @@ -475,10 +453,8 @@ debug (const char *file, #endif } - GHashTable *static_strings = NULL; - const char * get_static_string (const char *s) { @@ -500,7 +476,6 @@ get_static_string (const char *s) return result; } - char* g_uri_display_basename (const char *uri) { @@ -513,7 +488,6 @@ g_uri_display_basename (const char *uri) return name; } - const gchar * _g_path_get_file_name (const gchar *file_name) { @@ -538,7 +512,6 @@ _g_path_get_file_name (const gchar *file_name) return base + 1; } - const char * _g_path_get_base_name (const char *path, const char *base_dir, diff --git a/src/gtk-utils.c b/src/gtk-utils.c index ea64bd0..be21883 100644 --- a/src/gtk-utils.c +++ b/src/gtk-utils.c @@ -26,7 +26,6 @@ #include <gtk/gtk.h> #include "gtk-utils.h" - GtkWidget* _gtk_message_dialog_new (GtkWindow *parent, GtkDialogFlags flags, @@ -124,7 +123,6 @@ _gtk_message_dialog_new (GtkWindow *parent, return dialog; } - static GtkWidget * create_button (const char *icon_name, const char *text) @@ -146,7 +144,6 @@ create_button (const char *icon_name, return button; } - char * _gtk_request_dialog_run (GtkWindow *parent, GtkDialogFlags flags, @@ -235,7 +232,6 @@ _gtk_request_dialog_run (GtkWindow *parent, return result; } - GtkWidget* _gtk_error_dialog_new (GtkWindow *parent, GtkDialogFlags flags, @@ -378,7 +374,6 @@ _gtk_error_dialog_new (GtkWindow *parent, return dialog; } - void _gtk_error_dialog_run (GtkWindow *parent, const gchar *main_message, @@ -409,7 +404,6 @@ _gtk_error_dialog_run (GtkWindow *parent, gtk_widget_show (d); } - void _gtk_entry_set_locale_text (GtkEntry *entry, const char *text) @@ -427,7 +421,6 @@ _gtk_entry_set_locale_text (GtkEntry *entry, g_free (utf8_text); } - char * _gtk_entry_get_locale_text (GtkEntry *entry) { @@ -443,7 +436,6 @@ _gtk_entry_get_locale_text (GtkEntry *entry) return text; } - void _gtk_entry_set_filename_text (GtkEntry *entry, const char *text) @@ -458,7 +450,6 @@ _gtk_entry_set_filename_text (GtkEntry *entry, gtk_entry_set_text (entry, ""); } - static GdkPixbuf * get_themed_icon_pixbuf (GThemedIcon *icon, int size, @@ -487,7 +478,6 @@ get_themed_icon_pixbuf (GThemedIcon *icon, return pixbuf; } - static GdkPixbuf * get_file_icon_pixbuf (GFileIcon *icon, int size) @@ -505,7 +495,6 @@ get_file_icon_pixbuf (GFileIcon *icon, return pixbuf; } - GdkPixbuf * get_icon_pixbuf (GIcon *icon, int size, @@ -520,7 +509,6 @@ get_icon_pixbuf (GIcon *icon, return NULL; } - GdkPixbuf * get_mime_type_pixbuf (const char *mime_type, int icon_size, @@ -572,7 +560,6 @@ show_help_dialog (GtkWindow *parent, g_free (uri); } - int _gtk_widget_lookup_for_size (GtkWidget *widget, GtkIconSize icon_size) diff --git a/src/java-utils.c b/src/java-utils.c index fb95cf5..be6a181 100644 --- a/src/java-utils.c +++ b/src/java-utils.c @@ -29,14 +29,12 @@ #include <glib.h> #include "java-utils.h" - /* * The following code conforms to the JVM specification.(Java 2 Platform) * For further changes to the classfile structure, please update the * following macros. */ - /* Tags that identify structures */ #define CONST_CLASS 7 @@ -63,7 +61,6 @@ #define CONST_DOUBLE_INFO 8 #define CONST_NAMEANDTYPE_INFO 4 - /* represents the utf8 strings in class file */ struct utf_string { @@ -107,7 +104,6 @@ typedef struct { #endif } JavaClassFile; - static JavaClassFile* java_class_file_new (void) { @@ -119,7 +115,6 @@ java_class_file_new (void) return cfile; } - static void java_class_file_free (JavaClassFile *cfile) { @@ -142,7 +137,6 @@ java_class_file_free (JavaClassFile *cfile) g_free (cfile); } - /* The following function loads the utf8 strings and class structures from the * class file. */ static void @@ -231,7 +225,6 @@ load_constant_pool_utfs (JavaClassFile *cfile) #endif } - static char* close_and_exit (JavaClassFile *cfile) { @@ -239,7 +232,6 @@ close_and_exit (JavaClassFile *cfile) return NULL; } - /* This function extracts the package name from a class file */ char* get_package_name_from_class_file (char *fname) @@ -318,7 +310,6 @@ get_package_name_from_class_file (char *fname) return package; } - /* This function consumes a comment from the java file * multiline = TRUE implies that comment is multiline */ static void @@ -360,7 +351,6 @@ consume_comment (int fdesc, } } - /* This function extracts package name from a java file */ char* get_package_name_from_java_file (char *fname) diff --git a/src/java-utils.h b/src/java-utils.h index 3ed7f53..1bc403a 100644 --- a/src/java-utils.h +++ b/src/java-utils.h @@ -23,9 +23,7 @@ #ifndef JAVA_UTILS_H #define JAVA_UTILS_H - char* get_package_name_from_class_file (char *fname); char* get_package_name_from_java_file (char *fname); - #endif /* JAVA_UTILS_H */ @@ -236,7 +236,6 @@ prepare_app (void) g_free (extract_to_uri); } - static void startup_cb (GApplication *application) { @@ -244,7 +243,6 @@ startup_cb (GApplication *application) prepare_app (); } - static void activate_cb (GApplication *application) { @@ -259,7 +257,6 @@ activate_cb (GApplication *application) } } - static void fr_save_state (EggSMClient *client, GKeyFile *state, gpointer user_data) { @@ -305,7 +302,6 @@ fr_save_state (EggSMClient *client, GKeyFile *state, gpointer user_data) g_key_file_set_integer (state, "Session", "archives", i); } - int main (int argc, char **argv) { diff --git a/src/open-file.c b/src/open-file.c index ceda1d3..ef4a039 100644 --- a/src/open-file.c +++ b/src/open-file.c @@ -24,7 +24,6 @@ #include "open-file.h" #include "file-utils.h" - OpenFile* open_file_new (const char *path, const char *extracted_path, @@ -45,7 +44,6 @@ open_file_new (const char *path, return ofile; } - void open_file_free (OpenFile *ofile) { @@ -59,7 +57,6 @@ open_file_free (OpenFile *ofile) g_free (ofile); } - OpenFile * open_file_copy (OpenFile *src) { @@ -74,7 +71,6 @@ open_file_copy (OpenFile *src) return ofile; } - GType open_file_get_type (void) { diff --git a/src/preferences.c b/src/preferences.c index 0135cf4..551261c 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -27,7 +27,6 @@ #include "file-utils.h" #include "fr-window.h" - void pref_util_save_window_geometry (GtkWindow *window, const char *dialog_id) @@ -47,7 +46,6 @@ pref_util_save_window_geometry (GtkWindow *window, g_free (schema); } - void pref_util_restore_window_geometry (GtkWindow *window, const char *dialog_id) diff --git a/src/rar-utils.c b/src/rar-utils.c index 1af3645..3de6eaa 100644 --- a/src/rar-utils.c +++ b/src/rar-utils.c @@ -19,7 +19,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - #include <config.h> #include <string.h> #include "file-utils.h" @@ -27,14 +26,12 @@ #include "gio-utils.h" #include "rar-utils.h" - typedef enum { FIRST_VOLUME_IS_000, FIRST_VOLUME_IS_001, FIRST_VOLUME_IS_RAR } FirstVolumeExtension; - static char * get_first_volume_name (const char *name, const char *pattern, @@ -90,7 +87,6 @@ get_first_volume_name (const char *name, return volume_name; } - void rar_check_multi_volume (FrCommand *comm) { diff --git a/src/rar-utils.h b/src/rar-utils.h index 416d00b..bde55ef 100644 --- a/src/rar-utils.h +++ b/src/rar-utils.h @@ -22,7 +22,6 @@ #ifndef RAR_UTILS_H #define RAR_UTILS_H - #include "fr-command.h" void rar_check_multi_volume (FrCommand *comm); diff --git a/src/server.c b/src/server.c index 1ca6c4e..43c1e39 100644 --- a/src/server.c +++ b/src/server.c @@ -27,11 +27,9 @@ #include "file-utils.h" #include "fr-init.h" - #define FR_SERVICE_NAME "org.mate.Engrampa" #define FR_SERVICE_PATH "/org/mate/Engrampa" - static const char introspection_xml[] = "<node>" " <interface name='org.mate.ArchiveManager'>" @@ -173,7 +171,6 @@ static const char introspection_xml[] = static GDBusNodeInfo *introspection_data = NULL; - static void window_ready_cb (GtkWidget *widget, GError *error, @@ -189,7 +186,6 @@ window_ready_cb (GtkWidget *widget, error->message); } - static gboolean window_progress_cb (FrWindow *window, double fraction, @@ -211,7 +207,6 @@ window_progress_cb (FrWindow *window, return TRUE; } - static void handle_method_call (GDBusConnection *connection, const char *sender, @@ -385,14 +380,12 @@ handle_method_call (GDBusConnection *connection, } } - static const GDBusInterfaceVTable interface_vtable = { handle_method_call, NULL, /* handle_get_property */ NULL /* handle_set_property */ }; - static void on_bus_acquired (GDBusConnection *connection, const char *name, @@ -412,7 +405,6 @@ on_bus_acquired (GDBusConnection *connection, initialize_data (); } - static void on_name_acquired (GDBusConnection *connection, const char *name, @@ -420,7 +412,6 @@ on_name_acquired (GDBusConnection *connection, { } - static void on_name_lost (GDBusConnection *connection, const char *name, @@ -429,7 +420,6 @@ on_name_lost (GDBusConnection *connection, gtk_main_quit (); } - int main (int argc, char *argv[]) { diff --git a/src/test-server.c b/src/test-server.c index a9dcb5f..effe83e 100644 --- a/src/test-server.c +++ b/src/test-server.c @@ -22,10 +22,8 @@ #include <config.h> #include <gio/gio.h> - GMainLoop *loop; - static void engrampa_getsupportedtypes_ready_cb (GObject *source_object, GAsyncResult *res, @@ -89,7 +87,6 @@ engrampa_getsupportedtypes_ready_cb (GObject *source_object, g_main_loop_quit (loop); } - static void engrampa_addtoarchive_ready_cb (GObject *source_object, GAsyncResult *res, @@ -113,7 +110,6 @@ engrampa_addtoarchive_ready_cb (GObject *source_object, g_main_loop_quit (loop); } - static void on_signal (GDBusProxy *proxy, char *sender_name, @@ -132,7 +128,6 @@ on_signal (GDBusProxy *proxy, } } - int main (int argc, char *argv[]) { @@ -23,10 +23,8 @@ #ifndef UI_H #define UI_H - #include "actions.h" - static GtkActionEntry action_entries[] = { { "FileMenu", NULL, N_("_Archive"), NULL, NULL, NULL }, { "EditMenu", NULL, N_("_Edit"), NULL, NULL, NULL }, @@ -211,7 +209,6 @@ static GtkActionEntry action_entries[] = { }; static guint n_action_entries = G_N_ELEMENTS (action_entries); - static GtkToggleActionEntry action_toggle_entries[] = { { "ViewToolbar", NULL, N_("_Toolbar"), NULL, @@ -236,7 +233,6 @@ static GtkToggleActionEntry action_toggle_entries[] = { }; static guint n_action_toggle_entries = G_N_ELEMENTS (action_toggle_entries); - static GtkRadioActionEntry view_as_entries[] = { { "ViewAllFiles", NULL, N_("View All _Files"), "<control>1", @@ -247,7 +243,6 @@ static GtkRadioActionEntry view_as_entries[] = { }; static guint n_view_as_entries = G_N_ELEMENTS (view_as_entries); - static GtkRadioActionEntry sort_by_entries[] = { { "SortByName", NULL, N_("by _Name"), NULL, @@ -269,5 +264,4 @@ static GtkRadioActionEntry sort_by_entries[] = { }; static guint n_sort_by_entries = G_N_ELEMENTS (sort_by_entries); - #endif /* UI_H */ |