diff options
| author | rbuj <[email protected]> | 2021-10-27 17:34:17 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2021-11-20 16:50:14 +0100 |
| commit | 0a4384ca8c93b62bdf393cd1f3698bab1999fc6f (patch) | |
| tree | 9c68212e8ba254df3dc80cd091b8fd3198a9b643 /src | |
| parent | bdc5cf66eff8c52cf422cf7b0143ff3489bbb7b0 (diff) | |
| download | caja-0a4384ca8c93b62bdf393cd1f3698bab1999fc6f.tar.bz2 caja-0a4384ca8c93b62bdf393cd1f3698bab1999fc6f.tar.xz | |
Use a blank line at most
Diffstat (limited to 'src')
59 files changed, 0 insertions, 238 deletions
diff --git a/src/caja-application.c b/src/caja-application.c index 065f8cbd..ecfc6a82 100644 --- a/src/caja-application.c +++ b/src/caja-application.c @@ -925,7 +925,6 @@ caja_window_delete_event_callback (GtkWidget *widget, return TRUE; } - static CajaWindow * create_window (CajaApplication *application, GType window_type, @@ -1962,7 +1961,6 @@ caja_application_local_command_line (GApplication *application, g_option_context_add_group (context, egg_sm_client_get_option_group ()); - /* we need to do this here, as parsing the EggSMClient option context, * unsets this variable. */ @@ -1972,7 +1970,6 @@ caja_application_local_command_line (GApplication *application, self->priv->autostart = TRUE; } - argv = *arguments; argc = g_strv_length (argv); @@ -2237,7 +2234,6 @@ init_gtk_accels (void) G_CALLBACK (queue_accel_map_save_callback), NULL); } - static void caja_application_startup (GApplication *app) { diff --git a/src/caja-autorun-software.c b/src/caja-autorun-software.c index fef3c483..543206c5 100644 --- a/src/caja-autorun-software.c +++ b/src/caja-autorun-software.c @@ -22,7 +22,6 @@ Author: David Zeuthen <[email protected]> */ - #include <config.h> #include <unistd.h> #include <string.h> @@ -226,7 +225,6 @@ present_autorun_for_software_dialog (GMount *mount) * etc.) */ - icon = g_mount_get_icon (mount); icon_size = caja_get_icon_size_for_stock_size (GTK_ICON_SIZE_DIALOG); icon_info = caja_icon_info_lookup (icon, icon_size, diff --git a/src/caja-bookmark-list.c b/src/caja-bookmark-list.c index 8be0a00b..effd57c1 100644 --- a/src/caja-bookmark-list.c +++ b/src/caja-bookmark-list.c @@ -227,7 +227,6 @@ do_constructor (GType type, return retval; } - static void caja_bookmark_list_class_init (CajaBookmarkListClass *class) { diff --git a/src/caja-bookmarks-sidebar.c b/src/caja-bookmarks-sidebar.c index 3a06f065..fdff6e5d 100644 --- a/src/caja-bookmarks-sidebar.c +++ b/src/caja-bookmarks-sidebar.c @@ -51,7 +51,6 @@ #include "caja-bookmarks-sidebar.h" - typedef struct { GtkScrolledWindowClass parent; diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c index e97314cd..4abff840 100644 --- a/src/caja-bookmarks-window.c +++ b/src/caja-bookmarks-window.c @@ -673,7 +673,6 @@ on_remove_button_clicked (GtkButton *button, bookmarks_delete_bookmark (); } - /* This is a bit of a kludge to get DnD to work. We check if the row in the GtkListStore matches the one in the bookmark list. If it doesn't, we assume the bookmark has just been dragged here and we insert it into the bookmark @@ -839,7 +838,6 @@ on_selection_changed (GtkTreeSelection *treeselection, g_free (entry_text); } - static void update_bookmark_from_text (void) { diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c index 9caaced5..d97bcb0a 100644 --- a/src/caja-connect-server-dialog.c +++ b/src/caja-connect-server-dialog.c @@ -975,7 +975,6 @@ caja_connect_server_dialog_init (CajaConnectServerDialog *dialog) 1, get_method_description (&(methods[i])), -1); - if (methods[i].flags & DEFAULT_METHOD) { gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter); diff --git a/src/caja-connect-server-operation.h b/src/caja-connect-server-operation.h index 84df443d..755468e8 100644 --- a/src/caja-connect-server-operation.h +++ b/src/caja-connect-server-operation.h @@ -59,5 +59,4 @@ GType caja_connect_server_operation_get_type (void); GMountOperation * caja_connect_server_operation_new (CajaConnectServerDialog *dialog); - #endif /* __CAJA_CONNECT_SERVER_OPERATION_H__ */ diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c index ed65055e..f6fc6860 100644 --- a/src/caja-emblem-sidebar.c +++ b/src/caja-emblem-sidebar.c @@ -317,7 +317,6 @@ create_rename_emblem_dialog (CajaEmblemSidebar *emblem_sidebar, gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label, FALSE, FALSE, 8); - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 8); @@ -335,7 +334,6 @@ create_rename_emblem_dialog (CajaEmblemSidebar *emblem_sidebar, gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, TRUE, TRUE, 8); - return dialog; } @@ -407,15 +405,12 @@ create_emblem_widget_with_pixbuf (CajaEmblemSidebar *emblem_sidebar, prelight_pixbuf = eel_create_spotlight_pixbuf (pixbuf); - gtk_drag_source_set (event_box, GDK_BUTTON1_MASK, drag_types, G_N_ELEMENTS (drag_types), GDK_ACTION_COPY | GDK_ACTION_MOVE); gtk_drag_source_set_icon_pixbuf (event_box, pixbuf); - - g_signal_connect (event_box, "button_press_event", G_CALLBACK (caja_emblem_sidebar_button_press_cb), emblem_sidebar); @@ -489,13 +484,11 @@ emblem_name_entry_changed_cb (GtkWidget *entry, Emblem *emblem) emblem->name = g_strdup (text); } - static void destroy_emblem (Emblem *emblem, gpointer user_data) { g_return_if_fail (emblem != NULL); - if (emblem->pixbuf != NULL) { g_object_unref (emblem->pixbuf); @@ -1004,7 +997,6 @@ caja_emblem_sidebar_populate (CajaEmblemSidebar *emblem_sidebar) emblem_widget); } - icons = caja_emblem_list_available (); l = icons; diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index 5a4368a7..957a87d2 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -235,7 +235,6 @@ preferences_show_help (GtkWindow *parent, } } - static void caja_file_management_properties_dialog_response_cb (GtkDialog *parent, int response_id, @@ -721,7 +720,6 @@ extension_state_toggled (GtkCellRendererToggle *cell, gchar *path_str, gpointer gtk_tree_path_free (path); } - static void caja_file_management_properties_dialog_setup_media_page (GtkBuilder *builder) { @@ -756,7 +754,6 @@ caja_file_management_properties_dialog_setup_media_page (GtkBuilder *builder) gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (other_type_list_store), 1, GTK_SORT_ASCENDING); - content_types = g_content_types_get_registered (); for (l = content_types; l != NULL; l = l->next) @@ -1220,7 +1217,6 @@ caja_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow *wi G_CALLBACK(caja_file_management_properties_dialog_update_media_sensitivity), builder); - /* UI callbacks */ dialog = GTK_WIDGET (gtk_builder_get_object (builder, "file_management_dialog")); g_signal_connect_data (dialog, "response", diff --git a/src/caja-freedesktop-dbus.h b/src/caja-freedesktop-dbus.h index a3ac1504..89e80396 100644 --- a/src/caja-freedesktop-dbus.h +++ b/src/caja-freedesktop-dbus.h @@ -21,7 +21,6 @@ * Stefano Karapetsas <[email protected]> */ - #ifndef __CAJA_FREEDESKTOP_DBUS_H__ #define __CAJA_FREEDESKTOP_DBUS_H__ diff --git a/src/caja-history-sidebar.c b/src/caja-history-sidebar.c index 1a269375..cc3b9202 100644 --- a/src/caja-history-sidebar.c +++ b/src/caja-history-sidebar.c @@ -58,7 +58,6 @@ typedef struct GObjectClass parent; } CajaHistorySidebarProviderClass; - enum { HISTORY_SIDEBAR_COLUMN_ICON, diff --git a/src/caja-image-properties-page.c b/src/caja-image-properties-page.c index 8cdf19ce..afb66c9e 100644 --- a/src/caja-image-properties-page.c +++ b/src/caja-image-properties-page.c @@ -91,7 +91,6 @@ typedef struct GObjectClass parent; } CajaImagePropertiesPageProviderClass; - static GType caja_image_properties_page_provider_get_type (void); static void property_page_provider_iface_init (CajaPropertyPageProviderIface *iface); @@ -718,7 +717,6 @@ property_page_provider_iface_init (CajaPropertyPageProviderIface *iface) iface->get_pages = get_property_pages; } - static void caja_image_properties_page_provider_init (CajaImagePropertiesPageProvider *sidebar) { diff --git a/src/caja-information-panel.c b/src/caja-information-panel.c index d2eeb150..41a2c493 100644 --- a/src/caja-information-panel.c +++ b/src/caja-information-panel.c @@ -141,7 +141,6 @@ typedef struct GObjectClass parent; } CajaInformationPanelProviderClass; - G_DEFINE_TYPE_WITH_CODE (CajaInformationPanel, caja_information_panel, EEL_TYPE_BACKGROUND_BOX, G_ADD_PRIVATE (CajaInformationPanel) G_IMPLEMENT_INTERFACE (CAJA_TYPE_SIDEBAR, @@ -151,7 +150,6 @@ G_DEFINE_TYPE_WITH_CODE (CajaInformationPanelProvider, caja_information_panel_pr G_IMPLEMENT_INTERFACE (CAJA_TYPE_SIDEBAR_PROVIDER, sidebar_provider_iface_init)); - static const char * caja_information_panel_get_sidebar_id (CajaSidebar *sidebar) { diff --git a/src/caja-main.c b/src/caja-main.c index 68426509..75ccbdf5 100644 --- a/src/caja-main.c +++ b/src/caja-main.c @@ -278,4 +278,3 @@ main (int argc, char *argv[]) return retval; } - diff --git a/src/caja-navigation-window-menus.c b/src/caja-navigation-window-menus.c index 3d2ef60c..b3a6d948 100644 --- a/src/caja-navigation-window-menus.c +++ b/src/caja-navigation-window-menus.c @@ -65,7 +65,6 @@ static void schedule_refresh_go_menu (CajaNavigationWindow *window); - static void action_close_all_windows_callback (GtkAction *action, gpointer user_data) @@ -202,8 +201,6 @@ action_show_hide_toolbar_callback (GtkAction *action, G_GNUC_END_IGNORE_DEPRECATIONS; } - - static void action_show_hide_sidebar_callback (GtkAction *action, gpointer user_data) @@ -612,7 +609,6 @@ action_new_window_callback (GtkAction *action, caja_window_new_window (current_window); } - static void action_new_tab_callback (GtkAction *action, gpointer user_data) @@ -1065,7 +1061,6 @@ caja_navigation_window_initialize_actions (CajaNavigationWindow *window) caja_navigation_window_update_split_view_actions_sensitivity (window); } - /** * caja_window_initialize_menus * diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c index 29018b50..19669411 100644 --- a/src/caja-navigation-window-pane.c +++ b/src/caja-navigation-window-pane.c @@ -107,7 +107,6 @@ search_bar_focus_in_callback (CajaSearchBar *bar, caja_window_set_active_pane (pane->window, pane); } - static void search_bar_activate_callback (CajaSearchBar *bar, CajaNavigationWindowPane *pane) @@ -742,7 +741,6 @@ caja_navigation_window_pane_setup (CajaNavigationWindowPane *pane) gtk_widget_set_size_request (pane->widget, 60, 60); } - void caja_navigation_window_pane_show_location_bar_temporarily (CajaNavigationWindowPane *pane) { diff --git a/src/caja-navigation-window-slot.c b/src/caja-navigation-window-slot.c index 7f89834c..1e78929e 100644 --- a/src/caja-navigation-window-slot.c +++ b/src/caja-navigation-window-slot.c @@ -124,7 +124,6 @@ query_editor_changed_callback (CajaSearchBar *bar, caja_directory_unref (directory); } - static void caja_navigation_window_slot_update_query_editor (CajaWindowSlot *slot) { diff --git a/src/caja-navigation-window-slot.h b/src/caja-navigation-window-slot.h index 6766b201..84d4b1a7 100644 --- a/src/caja-navigation-window-slot.h +++ b/src/caja-navigation-window-slot.h @@ -30,7 +30,6 @@ typedef struct CajaNavigationWindowSlot CajaNavigationWindowSlot; typedef struct CajaNavigationWindowSlotClass CajaNavigationWindowSlotClass; - #define CAJA_TYPE_NAVIGATION_WINDOW_SLOT (caja_navigation_window_slot_get_type()) #define CAJA_NAVIGATION_WINDOW_SLOT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CAJA_NAVIGATION_WINDOW_SLOT_CLASS, CajaNavigationWindowSlotClass)) #define CAJA_NAVIGATION_WINDOW_SLOT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_NAVIGATION_WINDOW_SLOT, CajaNavigationWindowSlot)) diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c index 19174265..0768d326 100644 --- a/src/caja-navigation-window.c +++ b/src/caja-navigation-window.c @@ -91,7 +91,6 @@ static void mouse_forward_button_changed (gpointer callbac static void use_extra_mouse_buttons_changed (gpointer callback_data); static CajaWindowSlot *create_extra_pane (CajaNavigationWindow *window); - G_DEFINE_TYPE_WITH_PRIVATE (CajaNavigationWindow, caja_navigation_window, CAJA_TYPE_WINDOW) #define parent_class caja_navigation_window_parent_class @@ -1018,7 +1017,6 @@ caja_navigation_window_status_bar_showing (CajaNavigationWindow *window) return TRUE; } - void caja_navigation_window_hide_toolbar (CajaNavigationWindow *window) { diff --git a/src/caja-navigation-window.h b/src/caja-navigation-window.h index fb9d7bbe..ea5390b0 100644 --- a/src/caja-navigation-window.h +++ b/src/caja-navigation-window.h @@ -58,7 +58,6 @@ typedef struct _CajaNavigationWindow CajaNavigationWindow; typedef struct _CajaNavigationWindowClass CajaNavigationWindowClass; typedef struct _CajaNavigationWindowPrivate CajaNavigationWindowPrivate; - struct _CajaNavigationWindow { CajaWindow parent_object; @@ -72,7 +71,6 @@ struct _CajaNavigationWindow GList *sidebar_panels; }; - struct _CajaNavigationWindowClass { CajaWindowClass parent_spot; diff --git a/src/caja-notebook.c b/src/caja-notebook.c index e576bfcb..ded19ead 100644 --- a/src/caja-notebook.c +++ b/src/caja-notebook.c @@ -199,7 +199,6 @@ caja_notebook_constructed (GObject *object) gtk_widget_add_events (widget, GDK_SCROLL_MASK); } - void caja_notebook_sync_loading (CajaNotebook *notebook, CajaWindowSlot *slot) @@ -405,7 +404,6 @@ caja_notebook_add_tab (CajaNotebook *notebook, caja_notebook_sync_tab_label (notebook, slot); caja_notebook_sync_loading (notebook, slot); - /* FIXME gtk bug! */ /* FIXME: this should be fixed in gtk 2.12; check & remove this! */ /* The signal handler may have reordered the tabs */ diff --git a/src/caja-notes-viewer.c b/src/caja-notes-viewer.c index 65916f9e..10f03e0b 100644 --- a/src/caja-notes-viewer.c +++ b/src/caja-notes-viewer.c @@ -73,7 +73,6 @@ typedef struct GObjectClass parent; } CajaNotesViewerProviderClass; - G_DEFINE_TYPE_WITH_CODE (CajaNotesViewer, caja_notes_viewer, GTK_TYPE_SCROLLED_WINDOW, G_IMPLEMENT_INTERFACE (CAJA_TYPE_SIDEBAR, caja_notes_viewer_sidebar_iface_init)); @@ -86,7 +85,6 @@ G_DEFINE_TYPE_WITH_CODE (CajaNotesViewerProvider, caja_notes_viewer_provider, G_ G_IMPLEMENT_INTERFACE (CAJA_TYPE_SIDEBAR_PROVIDER, sidebar_provider_iface_init)); - struct _CajaNotesViewerDetails { GtkWidget *note_text_field; @@ -383,7 +381,6 @@ caja_notes_viewer_finalize (GObject *object) G_OBJECT_CLASS (caja_notes_viewer_parent_class)->finalize (object); } - static void caja_notes_viewer_class_init (CajaNotesViewerClass *class) { @@ -484,7 +481,6 @@ get_property_pages (CajaPropertyPageProvider *provider, char *uri; CajaNotesViewer *viewer; - /* Only show the property page if 1 file is selected */ if (!files || files->next != NULL) { diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c index a0789029..332b6c1e 100644 --- a/src/caja-pathbar.c +++ b/src/caja-pathbar.c @@ -142,7 +142,6 @@ static gboolean caja_path_bar_update_path (CajaPathBar *path_bar, GFile *file_path, gboolean emit_signal); - static GtkWidget * get_slider_button (CajaPathBar *path_bar, const gchar *arrow_type) @@ -186,7 +185,6 @@ update_button_types (CajaPathBar *path_bar) } } - static void desktop_location_changed_callback (gpointer user_data) { @@ -431,7 +429,6 @@ caja_path_bar_class_init (CajaPathBarClass *path_bar_class) gtk_container_class_handle_border_width (container_class); } - static void caja_path_bar_finalize (GObject *object) { @@ -548,7 +545,6 @@ caja_path_bar_get_preferred_width (GtkWidget *widget, &slider_width, NULL); - if (path_bar->button_list) { *minimum += (path_bar->spacing + slider_width) * 2; *natural += (path_bar->spacing + slider_width) * 2; @@ -930,7 +926,6 @@ caja_path_bar_scroll (GtkWidget *widget, return FALSE; } - static void caja_path_bar_add (GtkContainer *container, GtkWidget *widget) @@ -1247,8 +1242,6 @@ caja_path_bar_state_flags_changed (GtkWidget *widget, } } - - /* Changes the icons wherever it is needed */ static void reload_icons (CajaPathBar *path_bar) @@ -1384,7 +1377,6 @@ button_drag_begin_cb (GtkWidget *widget, GINT_TO_POINTER (FALSE)); } - static CajaIconInfo * get_type_icon_info (ButtonData *button_data) { diff --git a/src/caja-pathbar.h b/src/caja-pathbar.h index fef82e7c..16966bf8 100644 --- a/src/caja-pathbar.h +++ b/src/caja-pathbar.h @@ -27,7 +27,6 @@ typedef struct _CajaPathBar CajaPathBar; typedef struct _CajaPathBarClass CajaPathBarClass; - #define CAJA_TYPE_PATH_BAR (caja_path_bar_get_type ()) #define CAJA_PATH_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_PATH_BAR, CajaPathBar)) #define CAJA_PATH_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_PATH_BAR, CajaPathBarClass)) diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c index 1120caed..2cd22148 100644 --- a/src/caja-places-sidebar.c +++ b/src/caja-places-sidebar.c @@ -562,7 +562,6 @@ update_places (CajaPlacesSidebar *sidebar) location, mount_uri, last_uri, &last_iter, &select_path); - /* XDG directories */ xdg_dirs = NULL; for (index = 0; index < G_USER_N_DIRECTORIES; index++) { @@ -809,7 +808,6 @@ update_places (CajaPlacesSidebar *sidebar) } g_list_free (mounts); - /* add bookmarks */ bookmark_count = caja_bookmark_list_length (sidebar->bookmarks); @@ -1853,7 +1851,6 @@ bookmarks_check_popup_sensitivity (CajaPlacesSidebar *sidebar) } } - g_free (uri); } @@ -1906,7 +1903,6 @@ volume_mounted_cb (GVolume *volume, g_object_unref (G_OBJECT (mount)); } - eel_remove_weak_pointer (&(sidebar->go_to_after_mount_slot)); } @@ -3060,7 +3056,6 @@ bookmarks_button_press_event_cb (GtkWidget *widget, return FALSE; } - static void bookmarks_edited (GtkCellRenderer *cell, gchar *path_string, diff --git a/src/caja-places-sidebar.h b/src/caja-places-sidebar.h index 016f7573..c0026a0f 100644 --- a/src/caja-places-sidebar.h +++ b/src/caja-places-sidebar.h @@ -43,7 +43,6 @@ #define CAJA_PLACES_SIDEBAR_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_PLACES_SIDEBAR, CajaPlacesSidebarClass)) - GType caja_places_sidebar_get_type (void); void caja_places_sidebar_register (void); diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c index 565fc5f0..3351421e 100644 --- a/src/caja-property-browser.c +++ b/src/caja-property-browser.c @@ -168,7 +168,6 @@ static GdkPixbuf * make_color_drag_image (CajaPropertyBro const char *color_spec, gboolean trim_edges); - #define BROWSER_CATEGORIES_FILE_NAME "browser.xml" #define PROPERTY_BROWSER_WIDTH 540 @@ -196,10 +195,8 @@ static GtkTargetEntry drag_types[] = { "text/uri-list", 0, PROPERTY_TYPE } }; - G_DEFINE_TYPE_WITH_PRIVATE (CajaPropertyBrowser, caja_property_browser, GTK_TYPE_WINDOW) - /* Destroy the three dialogs for adding patterns/colors/emblems if any of them exist. */ static void @@ -433,7 +430,6 @@ caja_property_browser_init (CajaPropertyBrowser *property_browser) g_signal_connect_object (property_browser->details->add_button, "clicked", G_CALLBACK (add_new_button_callback), property_browser, 0); - /* now create the actual content, with the category pane and the content frame */ /* the actual contents are created when necessary */ @@ -581,7 +577,6 @@ caja_property_browser_drag_begin (GtkWidget *widget, } - /* drag and drop data get handler */ static void @@ -800,7 +795,6 @@ make_drag_image (CajaPropertyBrowser *property_browser, const char* file_name) return pixbuf; } - /* create a pixbuf and fill it with a color */ static GdkPixbuf* @@ -1274,7 +1268,6 @@ add_pattern_to_browser (GtkDialog *dialog, gint response_id, gpointer data) return; } - user_directory = caja_get_user_directory (); /* copy the image file to the patterns directory */ @@ -1305,7 +1298,6 @@ add_pattern_to_browser (GtkDialog *dialog, gint response_id, gpointer data) g_object_unref (dest); g_free (basename); - /* update the property browser's contents to show the new one */ caja_property_browser_update_contents (property_browser); @@ -1486,7 +1478,6 @@ show_color_selection_window (GtkWidget *widget, gpointer data) gtk_widget_show (GTK_WIDGET(property_browser->details->colors_dialog)); } - /* here's the routine to add a new color, by putting up a color selector */ static void @@ -1580,7 +1571,6 @@ emblem_dialog_clicked (GtkWidget *dialog, int which_button, CajaPropertyBrowser stripped_keyword = g_strstrip (g_strdup (new_keyword)); } - caja_emblem_install_custom_emblem (pixbuf, stripped_keyword, stripped_keyword, @@ -1948,7 +1938,6 @@ make_properties_from_directories (CajaPropertyBrowser *property_browser) blank = eel_image_table_add_empty_image (image_table); labeled_image_configure (EEL_LABELED_IMAGE (blank)); - num_images = eel_wrap_table_get_num_children (EEL_WRAP_TABLE (image_table)); g_assert (num_images > 0); eel_wrap_table_reorder_child (EEL_WRAP_TABLE (image_table), @@ -2373,7 +2362,6 @@ caja_property_browser_update_contents (CajaPropertyBrowser *property_browser) } gtk_widget_show (property_browser->details->add_button); - if (property_browser->details->remove_mode) { @@ -2488,7 +2476,6 @@ caja_property_browser_set_category (CajaPropertyBrowser *property_browser, caja_property_browser_update_contents (property_browser); } - /* here is the routine that populates the property browser with the appropriate information when the path changes */ @@ -2516,7 +2503,6 @@ emblems_changed_callback (GObject *signaller, caja_property_browser_update_contents (property_browser); } - static void emit_emblems_changed_signal (void) { diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c index 0a20b04d..2c600c5d 100644 --- a/src/caja-query-editor.c +++ b/src/caja-query-editor.c @@ -74,7 +74,6 @@ typedef struct void *data; } CajaQueryEditorRow; - typedef struct { const char *name; @@ -526,7 +525,6 @@ tags_add_rows_from_query (CajaQueryEditor *editor, g_free (tags_str); } - /* Type */ static gboolean @@ -710,7 +708,6 @@ type_add_custom_type (CajaQueryEditorRow *row, -1); } - static void type_combo_changed (GtkComboBox *combo_box, CajaQueryEditorRow *row) { @@ -764,8 +761,6 @@ type_combo_changed (GtkComboBox *combo_box, CajaQueryEditorRow *row) } g_list_free (mime_infos); - - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box)); dialog = gtk_dialog_new (); @@ -800,7 +795,6 @@ type_combo_changed (GtkComboBox *combo_box, CajaQueryEditorRow *row) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); - renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Name", renderer, @@ -991,7 +985,6 @@ remove_group_types_from_list (char **group_types, GList *mime_types) return mime_types; } - static void type_add_rows_from_query (CajaQueryEditor *editor, CajaQuery *query) @@ -1056,7 +1049,6 @@ type_add_rows_from_query (CajaQueryEditor *editor, /* End of row types */ - static GtkWidget *modtime_row_create_widgets(CajaQueryEditorRow *row) { GtkWidget *hbox = NULL; @@ -1195,7 +1187,6 @@ static void modtime_add_rows_from_query(CajaQueryEditor *editor, CajaQuery *quer { } - static GtkWidget *size_row_create_widgets(CajaQueryEditorRow *row) { GtkWidget *hbox = NULL; @@ -1382,7 +1373,6 @@ get_next_free_type (CajaQueryEditor *editor) gboolean found; GList *l; - for (type = 0; type < CAJA_QUERY_EDITOR_ROW_LAST; type++) { found = FALSE; diff --git a/src/caja-search-bar.c b/src/caja-search-bar.c index 9ae868c6..993880bb 100644 --- a/src/caja-search-bar.c +++ b/src/caja-search-bar.c @@ -56,7 +56,6 @@ EEL_CLASS_BOILERPLATE (CajaSearchBar, caja_search_bar, GTK_TYPE_EVENT_BOX) - static void finalize (GObject *object) { diff --git a/src/caja-self-check-functions.h b/src/caja-self-check-functions.h index ec503943..e2ec2158 100644 --- a/src/caja-self-check-functions.h +++ b/src/caja-self-check-functions.h @@ -26,7 +26,6 @@ * check functions in Caja proper. */ - #ifndef __CAJA_SELF_CHECK_FUNCTIONS_H__ #define __CAJA_SELF_CHECK_FUNCTIONS_H__ diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c index 437709d2..44bd2df4 100644 --- a/src/caja-side-pane.c +++ b/src/caja-side-pane.c @@ -519,7 +519,6 @@ caja_side_pane_show_panel (CajaSidePane *side_pane, page_num); } - static void shortcut_clicked_callback (GtkWidget *button, gpointer user_data) diff --git a/src/caja-sidebar-title.c b/src/caja-sidebar-title.c index 38031d50..bcba35cc 100644 --- a/src/caja-sidebar-title.c +++ b/src/caja-sidebar-title.c @@ -290,7 +290,6 @@ caja_sidebar_title_select_text_color (CajaSidebarTitle *sidebar_title, setup_gc_with_fg (sidebar_title, LABEL_INFO_COLOR_ACTIVE, eel_gdk_rgba_is_dark (&color) ? light_info_color : dark_info_color); - /* If EelBackground is not set in the widget, we can safely * use the foreground color from the theme, because it will * always be displayed against the gtk background */ diff --git a/src/caja-spatial-window.h b/src/caja-spatial-window.h index 58d9b2a4..d892e729 100644 --- a/src/caja-spatial-window.h +++ b/src/caja-spatial-window.h @@ -61,7 +61,6 @@ struct _CajaSpatialWindowClass CajaWindowClass parent_spot; }; - GType caja_spatial_window_get_type (void); void caja_spatial_window_set_location_button (CajaSpatialWindow *window, GFile *location); diff --git a/src/caja-view-as-action.c b/src/caja-view-as-action.c index ad17ec19..69e8fb69 100644 --- a/src/caja-view-as-action.c +++ b/src/caja-view-as-action.c @@ -53,7 +53,6 @@ enum PROP_WINDOW }; - static void activate_nth_short_list_item (CajaWindow *window, guint index) { @@ -167,7 +166,6 @@ view_as_changed_callback (CajaWindow *window, } } - static void connect_proxy (GtkAction *action, GtkWidget *proxy) diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c index f41d8e5f..1ba1a533 100644 --- a/src/caja-window-manage-views.c +++ b/src/caja-window-manage-views.c @@ -510,7 +510,6 @@ new_window_show_callback (GtkWidget *widget, user_data); } - void caja_window_slot_open_location_full (CajaWindowSlot *slot, GFile *location, @@ -754,7 +753,6 @@ caja_window_slot_open_location_with_selection (CajaWindowSlot *slot, flags, selection, NULL, NULL); } - void caja_window_slot_go_home (CajaWindowSlot *slot, gboolean new_tab) { @@ -833,7 +831,6 @@ report_nascent_content_view_failure_to_user (CajaWindowSlot *slot, g_free (message); } - const char * caja_window_slot_get_content_view_id (CajaWindowSlot *slot) { @@ -2226,7 +2223,6 @@ display_view_selection_failure (CajaWindow *window, CajaFile *file, g_free (detail_message); } - void caja_window_slot_stop_loading (CajaWindowSlot *slot) { diff --git a/src/caja-window-manage-views.h b/src/caja-window-manage-views.h index dbed9345..7bea55be 100644 --- a/src/caja-window-manage-views.h +++ b/src/caja-window-manage-views.h @@ -34,7 +34,6 @@ void caja_window_manage_views_close_slot (CajaWindowPane *pane, CajaWindowSlot *slot); - /* CajaWindowInfo implementation: */ void caja_window_report_load_underway (CajaWindow *window, CajaView *view); diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c index 7737067e..3b65fa79 100644 --- a/src/caja-window-menus.c +++ b/src/caja-window-menus.c @@ -775,7 +775,6 @@ connect_proxy_cb (GtkUIManager *manager, g_signal_connect (proxy, "deselect", G_CALLBACK (menu_item_deselect_cb), window); - /* This is a way to easily get surfaces into the menu items */ icon = g_object_get_data (G_OBJECT (action), "menu-icon"); if (icon != NULL) diff --git a/src/caja-window-pane.c b/src/caja-window-pane.c index abc1388b..a4143b38 100644 --- a/src/caja-window-pane.c +++ b/src/caja-window-pane.c @@ -36,7 +36,6 @@ G_DEFINE_TYPE (CajaWindowPane, G_TYPE_OBJECT) #define parent_class caja_window_pane_parent_class - static inline CajaWindowSlot * get_first_inactive_slot (CajaWindowPane *pane) { @@ -198,7 +197,6 @@ real_sync_location_widgets (CajaWindowPane *pane) slot->location); } - void caja_window_pane_sync_location_widgets (CajaWindowPane *pane) { diff --git a/src/caja-window-pane.h b/src/caja-window-pane.h index 4f68b9eb..dc47a058 100644 --- a/src/caja-window-pane.h +++ b/src/caja-window-pane.h @@ -78,7 +78,6 @@ struct _CajaWindowPane GType caja_window_pane_get_type (void); CajaWindowPane *caja_window_pane_new (CajaWindow *window); - void caja_window_pane_show (CajaWindowPane *pane); void caja_window_pane_zoom_in (CajaWindowPane *pane); void caja_window_pane_zoom_to_level (CajaWindowPane *pane, CajaZoomLevel level); @@ -93,5 +92,4 @@ CajaWindowSlot* caja_window_pane_get_slot_for_content_box (CajaWindowPane *pane, void caja_window_pane_switch_to (CajaWindowPane *pane); void caja_window_pane_grab_focus (CajaWindowPane *pane); - #endif /* CAJA_WINDOW_PANE_H */ diff --git a/src/caja-window-private.h b/src/caja-window-private.h index 72e60b75..580cdb72 100644 --- a/src/caja-window-private.h +++ b/src/caja-window-private.h @@ -214,7 +214,6 @@ gboolean caja_add_to_history_list_no_notify (GFile GList * caja_get_history_list (void); void caja_window_bookmarks_preference_changed_callback (gpointer user_data); - /* sync window GUI with current slot. Used when changing slots, * and when updating the slot state. */ diff --git a/src/caja-window-slot.c b/src/caja-window-slot.c index 261b83b6..dab7c449 100644 --- a/src/caja-window-slot.c +++ b/src/caja-window-slot.c @@ -109,7 +109,6 @@ real_update_query_editor (CajaWindowSlot *slot) caja_directory_unref (directory); } - static void real_active (CajaWindowSlot *slot) { @@ -176,7 +175,6 @@ caja_window_slot_inactive (CajaWindowSlot *slot) inactive, (slot)); } - static void caja_window_slot_init (CajaWindowSlot *slot) { @@ -340,7 +338,6 @@ caja_window_slot_set_title (CajaWindowSlot *slot, } } - /* caja_window_slot_update_title: * * Re-calculate the slot title. diff --git a/src/caja-window-toolbars.c b/src/caja-window-toolbars.c index 87fa627f..7dba77e3 100644 --- a/src/caja-window-toolbars.c +++ b/src/caja-window-toolbars.c @@ -112,7 +112,6 @@ caja_navigation_window_initialize_toolbars (CajaNavigationWindow *window) caja_navigation_window_activate_spinner (window); } - static GList * get_extension_toolbar_items (CajaNavigationWindow *window) { diff --git a/src/caja-window.c b/src/caja-window.c index 8de4f27b..a180414c 100644 --- a/src/caja-window.c +++ b/src/caja-window.c @@ -1416,7 +1416,6 @@ load_view_as_menu (CajaWindow *window) window->details->view_as_action_group = NULL; } - refresh_stored_viewers (window); merge_id = gtk_ui_manager_new_merge_id (window->details->ui_manager); @@ -1605,7 +1604,6 @@ zoom_level_changed_callback (CajaView *view, caja_window_sync_zoom_widgets (window); } - /* These are called * A) when switching the view within the active slot * B) when switching the active slot @@ -1709,7 +1707,6 @@ caja_window_get_next_pane (CajaWindow *window) return next_pane; } - void caja_window_slot_set_viewed_file (CajaWindowSlot *slot, CajaFile *file) @@ -1988,7 +1985,6 @@ caja_window_get_history (CajaWindow *window) return g_list_copy_deep (history_list, caja_window_copy_history_item, NULL); } - static CajaWindowType caja_window_get_window_type (CajaWindow *window) { @@ -2101,7 +2097,6 @@ caja_window_get_extra_slot (CajaWindow *window) g_assert (CAJA_IS_WINDOW (window)); - /* return NULL if there is only one pane */ if (window->details->panes == NULL || window->details->panes->next == NULL) diff --git a/src/caja-x-content-bar.c b/src/caja-x-content-bar.c index c4b822f0..5e451d7b 100644 --- a/src/caja-x-content-bar.c +++ b/src/caja-x-content-bar.c @@ -110,7 +110,6 @@ caja_x_content_bar_set_x_content_type (CajaXContentBar *bar, const char *x_conte message = g_strdup_printf (_("The media has been detected as \"%s\"."), description); } - gtk_label_set_text (GTK_LABEL (bar->priv->label), message); gtk_widget_show (bar->priv->label); @@ -184,7 +183,6 @@ caja_x_content_bar_set_mount (CajaXContentBar *bar, GMount *mount) bar->priv->mount = mount != NULL ? g_object_ref (mount) : NULL; } - static void caja_x_content_bar_set_property (GObject *object, guint prop_id, diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c index 125e04c3..8d504930 100644 --- a/src/caja-zoom-control.c +++ b/src/caja-zoom-control.c @@ -75,7 +75,6 @@ struct _CajaZoomControlPrivate gboolean marking_menu_items; }; - static guint signals[LAST_SIGNAL] = { 0 }; static gpointer accessible_parent_class; @@ -576,8 +575,6 @@ caja_zoom_control_scroll_event (GtkWidget *widget, GdkEventScroll *event) return TRUE; } - - static void caja_zoom_control_class_init (CajaZoomControlClass *class) { @@ -588,7 +585,6 @@ caja_zoom_control_class_init (CajaZoomControlClass *class) widget_class = GTK_WIDGET_CLASS (class); - gtk_widget_class_set_accessible_type (widget_class, caja_zoom_control_accessible_get_type ()); diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index 9d096fd2..a90f884f 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -812,7 +812,6 @@ real_merge_menus (FMDirectoryView *view) view); G_GNUC_END_IGNORE_DEPRECATIONS; - gtk_ui_manager_insert_action_group (ui_manager, action_group, 0); g_object_unref (action_group); /* owned by ui manager */ diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 7431c963..8ba1050d 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -153,7 +153,6 @@ enum PROP_WINDOW_SLOT }; - static guint signals[LAST_SIGNAL] = { 0 }; static GdkAtom copied_files_atom; @@ -498,7 +497,6 @@ file_and_directory_list_to_files (GList *fad_list) return g_list_reverse (res); } - static GList * file_and_directory_list_from_files (CajaDirectory *directory, GList *files) { @@ -523,7 +521,6 @@ file_and_directory_free (FileAndDirectory *fad) g_free (fad); } - static void file_and_directory_list_free (GList *list) { @@ -557,9 +554,6 @@ file_and_directory_hash (gconstpointer v) return GPOINTER_TO_UINT (fad->file) ^ GPOINTER_TO_UINT (fad->directory); } - - - static ScriptLaunchParameters * script_launch_parameters_new (CajaFile *file, FMDirectoryView *directory_view) @@ -807,7 +801,6 @@ action_open_close_parent_callback (GtkAction *action, caja_file_list_free (selection); } - static void action_open_alternate_callback (GtkAction *action, gpointer callback_data) @@ -1148,7 +1141,6 @@ action_invert_selection_callback (GtkAction *action, fm_directory_view_invert_selection (callback_data); } - static void pattern_select_response_cb (GtkWidget *dialog, int response, gpointer user_data) { @@ -1290,7 +1282,6 @@ action_reset_to_defaults_callback (GtkAction *action, fm_directory_view_reset_to_defaults (callback_data); } - static void hidden_files_mode_changed (CajaWindow *window, gpointer callback_data) @@ -1346,7 +1337,6 @@ query_name_entry_changed_cb (GtkWidget *entry, GtkWidget *button) gtk_widget_set_sensitive (button, sensitive); } - static void action_save_search_as_callback (GtkAction *action, gpointer callback_data) @@ -1460,7 +1450,6 @@ action_save_search_as_callback (GtkAction *action, } } - static void action_empty_trash_callback (GtkAction *action, gpointer callback_data) @@ -1819,7 +1808,6 @@ remove_directory_from_directory_list (FMDirectoryView *view, caja_directory_unref (directory); } - static void add_directory_to_scripts_directory_list (FMDirectoryView *view, CajaDirectory *directory) @@ -1980,7 +1968,6 @@ fm_directory_view_set_selection_locations (CajaView *caja_view, } } - void fm_directory_view_init_view_iface (CajaViewIface *iface) { @@ -2593,7 +2580,6 @@ done_loading (FMDirectoryView *view, view->details->loading = FALSE; } - typedef struct { GHashTable *debuting_files; GList *added_files; @@ -2723,7 +2709,6 @@ remove_not_really_moved_files (gpointer key, return TRUE; } - /* When this function is invoked, the file operation is over, but all * the icons may not have been added to the directory view yet, so * we can't select them yet. @@ -3171,8 +3156,6 @@ queue_pending_files (FMDirectoryView *view, } } - - *pending_list = g_list_concat (file_and_directory_list_from_files (directory, files), *pending_list); @@ -3545,7 +3528,6 @@ fm_directory_view_zoom_to_level (FMDirectoryView *view, zoom_to_level, (view, zoom_level)); } - CajaZoomLevel fm_directory_view_get_zoom_level (FMDirectoryView *view) { @@ -4013,7 +3995,6 @@ delayed_rename_file_hack_removed (RenameData *data) g_free (data); } - static void rename_file (FMDirectoryView *view, CajaFile *new_file) { @@ -4074,7 +4055,6 @@ typedef struct { GHashTable *added_locations; } NewFolderData; - static void track_newly_added_locations (FMDirectoryView *view, CajaFile *new_file, CajaDirectory *directory, gpointer user_data) @@ -4114,7 +4094,6 @@ new_folder_done (GFile *new_folder, gpointer user_data) screen = gtk_widget_get_screen (GTK_WIDGET (directory_view)); g_snprintf (screen_string, sizeof (screen_string), "%d", gdk_x11_screen_get_screen_number (screen)); - file = caja_file_get (new_folder); caja_file_set_metadata (file, CAJA_METADATA_KEY_SCREEN, @@ -4144,7 +4123,6 @@ new_folder_done (GFile *new_folder, gpointer user_data) g_free (data); } - static NewFolderData * new_folder_data_new (FMDirectoryView *directory_view) { @@ -4427,7 +4405,6 @@ escape_action_path (const char *action_path) return g_string_free (s, FALSE); } - static void add_submenu (GtkUIManager *ui_manager, GtkActionGroup *action_group, @@ -4762,7 +4739,6 @@ reset_open_with_menu (FMDirectoryView *view, GList *selection) add_x_content_apps (view, CAJA_FILE (selection->data), &applications); } - num_applications = g_list_length (applications); if (file_list_all_are_folders (selection)) { @@ -4874,7 +4850,6 @@ typedef struct GtkAction *action; } ExtensionActionCallbackData; - static void extension_action_callback_data_free (ExtensionActionCallbackData *data) { @@ -5351,7 +5326,6 @@ static void set_script_environment_variables(FMDirectoryView* view, GList* selec g_setenv("CAJA_SCRIPT_CURRENT_URI", uri, TRUE); g_setenv("NAUTILUS_SCRIPT_CURRENT_URI", uri, TRUE); // compatibilidad GNOME - g_free(uri); geometry_string = eel_gtk_window_get_geometry_string(GTK_WINDOW (fm_directory_view_get_containing_window (view))); @@ -5929,8 +5903,6 @@ update_directory_in_templates_menu (FMDirectoryView *view, return any_templates; } - - static void update_templates_menu (FMDirectoryView *view) { @@ -5991,7 +5963,6 @@ update_templates_menu (FMDirectoryView *view) g_free (templates_directory_uri); } - static void action_open_scripts_folder_callback (GtkAction *action, gpointer callback_data) @@ -7820,7 +7791,6 @@ real_merge_menus (FMDirectoryView *view) view->details->templates_invalid = TRUE; } - static gboolean can_paste_into_file (CajaFile *file) { @@ -7884,7 +7854,6 @@ clipboard_targets_received (GtkClipboard *clipboard, } } - selection = fm_directory_view_get_selection (view); count = g_list_length (selection); @@ -9144,7 +9113,6 @@ real_update_menus (FMDirectoryView *view) } gtk_action_set_sensitive (action, can_delete_files); - action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_RESTORE_FROM_TRASH); update_restore_from_trash_action (action, selection, FALSE); @@ -9218,7 +9186,6 @@ real_update_menus (FMDirectoryView *view) FM_ACTION_SAVE_SEARCH_AS); gtk_action_set_visible (action, show_save_search_as); - action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_SELECT_ALL); gtk_action_set_sensitive (action, !fm_directory_view_is_empty (view)); @@ -9283,7 +9250,6 @@ real_update_menus (FMDirectoryView *view) FM_ACTION_MOVE_TO_NEXT_PANE); gtk_action_set_sensitive (action, can_delete_files && next_pane_is_writable); - action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_COPY_TO_HOME); gtk_action_set_sensitive (action, can_copy_files); @@ -10263,7 +10229,6 @@ fm_directory_view_update_menus (FMDirectoryView *view) return; } - EEL_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, update_menus, (view)); @@ -10462,7 +10427,6 @@ revert_slashes (char *string) } } - static GdkDragAction ask_link_action (FMDirectoryView *view) { @@ -11034,7 +10998,6 @@ fm_directory_view_set_property (GObject *object, } } - gboolean fm_directory_view_handle_scroll_event (FMDirectoryView *directory_view, GdkEventScroll *event) @@ -11103,7 +11066,6 @@ fm_directory_view_scroll_event (GtkWidget *widget, return GTK_WIDGET_CLASS (parent_class)->scroll_event (widget, event); } - static void fm_directory_view_parent_set (GtkWidget *widget, GtkWidget *old_parent) diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c index c1585597..fbf80fdd 100644 --- a/src/file-manager/fm-ditem-page.c +++ b/src/file-manager/fm-ditem-page.c @@ -354,7 +354,6 @@ build_grid (GtkWidget *container, entry = gtk_entry_new (); gtk_widget_set_hexpand (entry, TRUE); - if (item_entry->localized) { val = g_key_file_get_locale_string (key_file, @@ -477,7 +476,6 @@ build_grid: gtk_widget_show_all (GTK_WIDGET (box)); } - static void ditem_read_cb (GObject *source_object, GAsyncResult *res, diff --git a/src/file-manager/fm-empty-view.c b/src/file-manager/fm-empty-view.c index d14f4cd2..bca067ca 100644 --- a/src/file-manager/fm-empty-view.c +++ b/src/file-manager/fm-empty-view.c @@ -77,7 +77,6 @@ fm_empty_view_add_file (FMDirectoryView *view, CajaFile *file, CajaDirectory *di g_message ("entire loading: %.3f, cumulative %.3f", elaps, cumu); } - static void fm_empty_view_begin_loading (FMDirectoryView *view) { @@ -88,7 +87,6 @@ fm_empty_view_clear (FMDirectoryView *view) { } - static void fm_empty_view_file_changed (FMDirectoryView *view, CajaFile *file, CajaDirectory *directory) { @@ -106,7 +104,6 @@ fm_empty_view_get_selection (FMDirectoryView *view) return NULL; } - static GList * fm_empty_view_get_selection_for_file_transfer (FMDirectoryView *view) { @@ -217,7 +214,6 @@ fm_empty_view_click_policy_changed (FMDirectoryView *directory_view) { } - static int fm_empty_view_compare_files (FMDirectoryView *view, CajaFile *file1, CajaFile *file2) { @@ -332,7 +328,6 @@ fm_empty_view_get_id (CajaView *view) return FM_EMPTY_VIEW_ID; } - static void fm_empty_view_iface_init (CajaViewIface *iface) { @@ -345,7 +340,6 @@ fm_empty_view_iface_init (CajaViewIface *iface) iface->grab_focus = fm_empty_view_grab_focus; } - static void fm_empty_view_init (FMEmptyView *empty_view) { diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c index 93cf77f4..1cb8a3bc 100644 --- a/src/file-manager/fm-error-reporting.c +++ b/src/file-manager/fm-error-reporting.c @@ -206,7 +206,6 @@ fm_report_error_setting_group (CajaFile *file, error->message); } - eel_show_error_dialog (_("The group could not be changed."), message, parent_window); g_free (file_name); diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index b6345018..1843fd2e 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -116,7 +116,6 @@ struct FMIconViewDetails gulong clipboard_handler_id; }; - /* Note that the first item in this list is the default sort, * and that the items show up in the menu in the order they * appear in this list. @@ -483,7 +482,6 @@ action_tighter_layout_callback (GtkAction *action, G_GNUC_END_IGNORE_DEPRECATIONS; } - static gboolean fm_icon_view_using_auto_layout (FMIconView *icon_view) { @@ -558,7 +556,6 @@ fm_icon_view_clear (FMDirectoryView *view) g_slist_free (file_list); } - static gboolean should_show_file_on_screen (FMDirectoryView *view, CajaFile *file) { @@ -817,7 +814,6 @@ update_layout_menus (FMIconView *view) G_GNUC_END_IGNORE_DEPRECATIONS; } - static char * fm_icon_view_get_directory_sort_by (FMIconView *icon_view, CajaFile *file) @@ -1064,7 +1060,6 @@ fm_icon_view_real_get_directory_auto_layout (FMIconView *icon_view, CajaFile *file) { - return caja_file_get_boolean_metadata (file, CAJA_METADATA_KEY_ICON_VIEW_AUTO_LAYOUT, TRUE); } @@ -1651,7 +1646,6 @@ set_sort_criterion_by_sort_type (FMIconView *icon_view, fm_icon_view_reveal_selection (FM_DIRECTORY_VIEW (icon_view)); } - static void action_reversed_order_callback (GtkAction *action, gpointer user_data) @@ -2101,7 +2095,6 @@ fm_icon_view_get_selected_icon_locations (FMDirectoryView *view) (get_icon_container (FM_ICON_VIEW (view))); } - static void fm_icon_view_set_selection (FMDirectoryView *view, GList *selection) { @@ -2409,7 +2402,6 @@ sound_preview_type_supported (CajaFile *file) return FALSE; } - static gboolean should_preview_sound (CajaFile *file) { @@ -2542,7 +2534,6 @@ compare_files (FMDirectoryView *icon_view, return fm_icon_view_compare_files ((FMIconView *)icon_view, a, b); } - void fm_icon_view_filter_by_screen (FMIconView *icon_view, gboolean filter) @@ -2727,7 +2718,6 @@ icon_position_changed_callback (CajaIconContainer *container, g_free (position_string); } - g_ascii_dtostr (scale_string, sizeof (scale_string), position->scale); caja_file_set_metadata (file, CAJA_METADATA_KEY_ICON_SCALE, @@ -2938,7 +2928,6 @@ all_columns_same_width_changed_callback (gpointer callback_data) set_columns_same_width (icon_view); } - static void fm_icon_view_sort_directories_first_changed (FMDirectoryView *directory_view) { @@ -3259,8 +3248,6 @@ fm_icon_view_set_property (GObject *object, } } - - static void fm_icon_view_class_init (FMIconViewClass *klass) { @@ -3503,7 +3490,6 @@ fm_icon_view_supports_uri (const char *uri, view_info.startup_error_label = _(view_info.startup_error_label); \ view_info.display_location_label = _(view_info.display_location_label); \ - static CajaViewInfo fm_icon_view = { .id = FM_ICON_VIEW_ID, diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c index a04b27f9..863efd2e 100644 --- a/src/file-manager/fm-list-model.c +++ b/src/file-manager/fm-list-model.c @@ -235,7 +235,6 @@ fm_list_model_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter) GSequenceIter *ptr; FileEntry *file_entry; - model = (FMListModel *)tree_model; g_return_val_if_fail (iter->stamp == model->details->stamp, NULL); @@ -660,7 +659,6 @@ lookup_file (FMListModel *model, CajaFile *file, return ptr; } - struct GetIters { FMListModel *model; @@ -734,7 +732,6 @@ fm_list_model_get_first_iter_for_file (FMListModel *model, return res; } - gboolean fm_list_model_get_tree_iter_from_file (FMListModel *model, CajaFile *file, CajaDirectory *directory, @@ -1121,7 +1118,6 @@ fm_list_model_add_file (FMListModel *model, CajaFile *file, } } - file_entry->ptr = g_sequence_insert_sorted (files, file_entry, fm_list_model_file_entry_compare_func, model); @@ -1171,7 +1167,6 @@ fm_list_model_file_changed (FMListModel *model, CajaFile *file, return; } - pos_before = g_sequence_iter_get_position (ptr); g_sequence_sort_changed (ptr, fm_list_model_file_entry_compare_func, model); @@ -1493,8 +1488,6 @@ fm_list_model_unload_subdirectory (FMListModel *model, GtkTreeIter *iter) file_entry->reverse_map = NULL; } - - void fm_list_model_set_should_sort_directories_first (FMListModel *model, gboolean sort_directories_first) { diff --git a/src/file-manager/fm-list-model.h b/src/file-manager/fm-list-model.h index b63f8ae4..4e67b8c4 100644 --- a/src/file-manager/fm-list-model.h +++ b/src/file-manager/fm-list-model.h @@ -126,7 +126,6 @@ int fm_list_model_compare_func (FMListModel *model, CajaFile *file1, CajaFile *file2); - int fm_list_model_add_column (FMListModel *model, CajaColumn *column); diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 39e4bcdb..921128b0 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -153,7 +153,6 @@ static void fm_list_view_rename_callback (CajaFile *file, GError *error, gpointer callback_data); - G_DEFINE_TYPE_WITH_CODE (FMListView, fm_list_view, FM_TYPE_DIRECTORY_VIEW, G_IMPLEMENT_INTERFACE (CAJA_TYPE_VIEW, fm_list_view_iface_init)); @@ -246,7 +245,6 @@ activate_selected_items (FMListView *view) file_list = fm_list_view_get_selection (FM_DIRECTORY_VIEW (view)); - if (view->details->renaming_file) { /* We're currently renaming a file, wait until the rename is @@ -1051,7 +1049,6 @@ row_collapsed_callback (GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *p -1); } - uri = caja_file_get_uri (file); caja_debug_log (FALSE, CAJA_DEBUG_LOG_DOMAIN_USER, "list view row collapsed window=%p: %s", @@ -1316,7 +1313,6 @@ sort_column_changed_callback (GtkTreeSortable *sortable, } } - reversed_attr = (reversed ? "true" : "false"); caja_file_set_metadata (file, CAJA_METADATA_KEY_LIST_VIEW_SORT_REVERSED, default_reversed_attr, reversed_attr); @@ -1849,7 +1845,6 @@ create_and_set_up_tree_view (FMListView *view) gtk_widget_show (GTK_WIDGET (view->details->tree_view)); gtk_container_add (GTK_CONTAINER (view), GTK_WIDGET (view->details->tree_view)); - atk_obj = gtk_widget_get_accessible (GTK_WIDGET (view->details->tree_view)); atk_object_set_name (atk_obj, _("List View")); } @@ -2112,7 +2107,6 @@ fm_list_view_rename_callback (CajaFile *file, g_object_unref (view); } - static void fm_list_view_file_changed (FMDirectoryView *view, CajaFile *file, CajaDirectory *directory) { @@ -2219,7 +2213,6 @@ fm_list_view_get_selection_for_file_transfer_foreach_func (GtkTreeModel *model, } } - static GList * fm_list_view_get_selection_for_file_transfer (FMDirectoryView *view) { @@ -2234,9 +2227,6 @@ fm_list_view_get_selection_for_file_transfer (FMDirectoryView *view) return g_list_reverse (selection_data.list); } - - - static guint fm_list_view_get_item_count (FMDirectoryView *view) { @@ -2334,7 +2324,6 @@ fm_list_view_remove_file (FMDirectoryView *view, CajaFile *file, CajaDirectory * } } - } static void @@ -3394,7 +3383,6 @@ fm_list_view_get_id (CajaView *view) return FM_LIST_VIEW_ID; } - static void fm_list_view_iface_init (CajaViewIface *iface) { @@ -3406,7 +3394,6 @@ fm_list_view_iface_init (CajaViewIface *iface) iface->get_title = NULL; } - static void fm_list_view_init (FMListView *list_view) { diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 944b18f0..0ab2bfc7 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -414,7 +414,6 @@ get_image_for_properties_window (FMPropertiesWindow *window, g_object_unref (icon); } - static void update_properties_window_icon (FMPropertiesWindow *window) { @@ -461,7 +460,6 @@ uri_is_local_image (const char *uri) return TRUE; } - static void reset_icon (FMPropertiesWindow *properties_window) { @@ -481,7 +479,6 @@ reset_icon (FMPropertiesWindow *properties_window) } } - static void fm_properties_window_drag_data_received (GtkWidget *widget, GdkDragContext *context, int x, int y, @@ -505,7 +502,6 @@ fm_properties_window_drag_data_received (GtkWidget *widget, GdkDragContext *cont uris = g_strsplit (gtk_selection_data_get_data (selection_data), "\r\n", 0); exactly_one = uris[0] != NULL && (uris[1] == NULL || uris[1][0] == '\0'); - if (!exactly_one) { eel_show_error_dialog (_("You cannot assign more than one custom icon at a time!"), @@ -1302,7 +1298,6 @@ file_list_get_string_attribute (GList *file_list, } } - static gboolean file_list_all_directories (GList *file_list) { @@ -1749,7 +1744,6 @@ tree_model_get_entry_index (GtkTreeModel *model, return -1; } - static void synch_groups_combo_box (GtkComboBox *combo_box, CajaFile *file) { @@ -2418,8 +2412,6 @@ attach_title_field (GtkGrid *grid, return attach_label (grid, NULL, title, FALSE, FALSE, TRUE); } - - #define INCONSISTENT_STATE_STRING \ "\xE2\x80\x92" @@ -2627,7 +2619,6 @@ should_show_file_type (FMPropertiesWindow *window) return FALSE; } - return TRUE; } @@ -2806,7 +2797,6 @@ paint_pie_chart (GtkWidget *widget, width = allocation.width; height = allocation.height; - free = (double)window->details->volume_free / (double)window->details->volume_capacity; used = 1.0 - free; @@ -2860,7 +2850,6 @@ paint_pie_chart (GtkWidget *widget, cairo_line_to (cr,xc,yc); } - gdk_cairo_set_source_rgba (cr, &window->details->free_color); cairo_fill_preserve(cr); @@ -2870,7 +2859,6 @@ paint_pie_chart (GtkWidget *widget, } } - /* Copied from gtk/gtkstyle.c */ static void @@ -3057,7 +3045,6 @@ _pie_style_shade (GdkRGBA *a, b->alpha = a->alpha; } - static GtkWidget* create_pie_widget (FMPropertiesWindow *window) { @@ -3109,7 +3096,6 @@ create_pie_widget (FMPropertiesWindow *window) } - if (!gtk_style_context_lookup_color (style, "chart_rgba_2", &window->details->free_color)) { window->details->free_color.red = FREE_FILL_R; window->details->free_color.green = FREE_FILL_G; @@ -3447,7 +3433,6 @@ files_has_changable_permissions_directory (FMPropertiesWindow *window) return FALSE; } - static gboolean files_has_file (FMPropertiesWindow *window) { @@ -3465,7 +3450,6 @@ files_has_file (FMPropertiesWindow *window) return FALSE; } - static void create_emblems_page (FMPropertiesWindow *window) { @@ -3810,7 +3794,6 @@ permission_button_update (FMPropertiesWindow *window, sensitive |= window->details->has_recursive_apply; } - g_signal_handlers_block_by_func (G_OBJECT (button), G_CALLBACK (permission_button_toggled), window); @@ -3970,7 +3953,6 @@ permission_to_vfs (PermissionType type, PermissionValue perm) return vfs_perm; } - static PermissionValue permission_from_vfs (PermissionType type, guint32 vfs_perm) { @@ -4306,7 +4288,6 @@ add_permissions_combo_box (FMPropertiesWindow *window, GtkGrid *grid, GTK_POS_RIGHT, 1, 1); } - static GtkWidget * append_special_execution_checkbox (FMPropertiesWindow *window, GtkGrid *grid, @@ -4695,7 +4676,6 @@ set_recursive_permissions_done (gpointer callback_data) g_object_unref (window); } - static void apply_recursive_clicked (GtkWidget *recursive_button, FMPropertiesWindow *window) @@ -5149,7 +5129,6 @@ create_open_with_page (FMPropertiesWindow *window) vbox, gtk_label_new (_("Open With"))); } - static FMPropertiesWindow * create_properties_window (StartupData *startup_data) { @@ -5405,7 +5384,6 @@ is_directory_ready_callback (CajaFile *file, } } - void fm_properties_window_present (GList *original_files, GtkWidget *parent_widget) @@ -5440,7 +5418,6 @@ fm_properties_window_present (GList *original_files, return; } - pending_key = get_pending_key (original_files); /* Look to see if we're already waiting for a window for this file. */ @@ -5474,7 +5451,6 @@ fm_properties_window_present (GList *original_files, _("Creating Properties window."), parent_window == NULL ? NULL : GTK_WINDOW (parent_window)); - for (l = startup_data->target_files; l != NULL; l = next) { next = l->next; caja_file_call_when_ready diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c index 7d789edf..017d9f8c 100644 --- a/src/file-manager/fm-tree-model.c +++ b/src/file-manager/fm-tree-model.c @@ -2114,4 +2114,3 @@ fm_tree_model_tree_model_init (GtkTreeModelIface *iface) iface->unref_node = fm_tree_model_unref_node; } - diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c index edc5b138..2e7cfbb5 100644 --- a/src/file-manager/fm-tree-view.c +++ b/src/file-manager/fm-tree-view.c @@ -74,7 +74,6 @@ typedef struct GObjectClass parent; } FMTreeViewProviderClass; - struct FMTreeViewDetails { CajaWindowInfo *window; @@ -157,7 +156,6 @@ notify_clipboard_info (CajaClipboardMonitor *monitor, } } - static gboolean show_iter_for_file (FMTreeView *view, CajaFile *file, GtkTreeIter *iter) { @@ -622,7 +620,6 @@ compare_rows (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer call return result; } - static char * get_root_uri_callback (CajaTreeViewDragDest *dest, gpointer user_data) @@ -1266,7 +1263,6 @@ create_popup_menu (FMTreeView *view) G_CALLBACK (popup_menu_deactivated), view); - /* add the "open" menu item */ menu_item = eel_image_menu_item_new_from_icon ("document-open", _("_Open")); g_signal_connect (menu_item, "activate", @@ -1428,7 +1424,6 @@ create_tree (FMTreeView *view) fm_tree_model_add_root_uri (view->details->child_model, "trash:///", _("Trash"), icon, NULL); g_object_unref (icon); - volume_monitor = g_volume_monitor_get (); view->details->volume_monitor = volume_monitor; mounts = g_volume_monitor_get_mounts (volume_monitor); diff --git a/src/file-manager/fm-tree-view.h b/src/file-manager/fm-tree-view.h index c79057b8..23ca9106 100644 --- a/src/file-manager/fm-tree-view.h +++ b/src/file-manager/fm-tree-view.h @@ -25,7 +25,6 @@ /* fm-tree-view.h - tree view. */ - #ifndef FM_TREE_VIEW_H #define FM_TREE_VIEW_H diff --git a/src/file-manager/fm-widget-view.c b/src/file-manager/fm-widget-view.c index f0483d79..968672d6 100644 --- a/src/file-manager/fm-widget-view.c +++ b/src/file-manager/fm-widget-view.c @@ -381,7 +381,6 @@ fm_widget_view_get_id (CajaView *view) return FM_WIDGET_VIEW_ID; } - static void fm_widget_view_iface_init (CajaViewIface *iface) { @@ -394,7 +393,6 @@ fm_widget_view_iface_init (CajaViewIface *iface) iface->grab_focus = fm_widget_view_grab_focus; } - static void fm_widget_view_init (FMWidgetView *widget_view) { |