diff options
Diffstat (limited to 'src/file-manager')
-rw-r--r-- | src/file-manager/fm-desktop-icon-view.c | 1 | ||||
-rw-r--r-- | src/file-manager/fm-directory-view.c | 38 | ||||
-rw-r--r-- | src/file-manager/fm-ditem-page.c | 2 | ||||
-rw-r--r-- | src/file-manager/fm-empty-view.c | 6 | ||||
-rw-r--r-- | src/file-manager/fm-error-reporting.c | 1 | ||||
-rw-r--r-- | src/file-manager/fm-icon-view.c | 14 | ||||
-rw-r--r-- | src/file-manager/fm-list-model.c | 7 | ||||
-rw-r--r-- | src/file-manager/fm-list-model.h | 1 | ||||
-rw-r--r-- | src/file-manager/fm-list-view.c | 13 | ||||
-rw-r--r-- | src/file-manager/fm-properties-window.c | 24 | ||||
-rw-r--r-- | src/file-manager/fm-tree-model.c | 1 | ||||
-rw-r--r-- | src/file-manager/fm-tree-view.c | 5 | ||||
-rw-r--r-- | src/file-manager/fm-tree-view.h | 1 | ||||
-rw-r--r-- | src/file-manager/fm-widget-view.c | 2 |
14 files changed, 0 insertions, 116 deletions
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) { |