diff options
Diffstat (limited to 'src/nautilus-files-view.c')
| -rw-r--r-- | src/nautilus-files-view.c | 11250 |
1 files changed, 5923 insertions, 5327 deletions
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index b1acfe845..73c88a17c 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -130,31 +130,33 @@ #define MIN_COMMON_FILENAME_PREFIX_LENGTH 4 -enum { - ADD_FILE, - BEGIN_FILE_CHANGES, - BEGIN_LOADING, - CLEAR, - END_FILE_CHANGES, - END_LOADING, - FILE_CHANGED, - MOVE_COPY_ITEMS, - REMOVE_FILE, - SELECTION_CHANGED, - TRASH, - DELETE, - LAST_SIGNAL +enum +{ + ADD_FILE, + BEGIN_FILE_CHANGES, + BEGIN_LOADING, + CLEAR, + END_FILE_CHANGES, + END_LOADING, + FILE_CHANGED, + MOVE_COPY_ITEMS, + REMOVE_FILE, + SELECTION_CHANGED, + TRASH, + DELETE, + LAST_SIGNAL }; -enum { - PROP_WINDOW_SLOT = 1, - PROP_SUPPORTS_ZOOMING, - PROP_ICON, - PROP_IS_SEARCH, - PROP_IS_LOADING, - PROP_LOCATION, - PROP_SEARCH_QUERY, - NUM_PROPERTIES +enum +{ + PROP_WINDOW_SLOT = 1, + PROP_SUPPORTS_ZOOMING, + PROP_ICON, + PROP_IS_SEARCH, + PROP_IS_LOADING, + PROP_LOCATION, + PROP_SEARCH_QUERY, + NUM_PROPERTIES }; static guint signals[LAST_SIGNAL]; @@ -168,185 +170,188 @@ static GHashTable *script_accels = NULL; struct NautilusFilesViewDetails { - /* Main components */ - GtkWidget *overlay; + /* Main components */ + GtkWidget *overlay; - NautilusWindowSlot *slot; - NautilusDirectory *model; - NautilusFile *directory_as_file; - GFile *location; - guint dir_merge_id; + NautilusWindowSlot *slot; + NautilusDirectory *model; + NautilusFile *directory_as_file; + GFile *location; + guint dir_merge_id; - NautilusQuery *search_query; + NautilusQuery *search_query; - NautilusRenameFilePopoverController *rename_file_controller; - NautilusNewFolderDialogController *new_folder_controller; - NautilusCompressDialogController *compress_controller; + NautilusRenameFilePopoverController *rename_file_controller; + NautilusNewFolderDialogController *new_folder_controller; + NautilusCompressDialogController *compress_controller; - gboolean supports_zooming; + gboolean supports_zooming; - GList *scripts_directory_list; - GList *templates_directory_list; + GList *scripts_directory_list; + GList *templates_directory_list; - guint display_selection_idle_id; - guint update_context_menus_timeout_id; - guint update_status_idle_id; - guint reveal_selection_idle_id; + guint display_selection_idle_id; + guint update_context_menus_timeout_id; + guint update_status_idle_id; + guint reveal_selection_idle_id; - guint display_pending_source_id; - guint changes_timeout_id; + guint display_pending_source_id; + guint changes_timeout_id; - guint update_interval; - guint64 last_queued; + guint update_interval; + guint64 last_queued; - guint files_added_handler_id; - guint files_changed_handler_id; - guint load_error_handler_id; - guint done_loading_handler_id; - guint file_changed_handler_id; + guint files_added_handler_id; + guint files_changed_handler_id; + guint load_error_handler_id; + guint done_loading_handler_id; + guint file_changed_handler_id; - GList *new_added_files; - GList *new_changed_files; + GList *new_added_files; + GList *new_changed_files; - GHashTable *non_ready_files; + GHashTable *non_ready_files; - GList *old_added_files; - GList *old_changed_files; + GList *old_added_files; + GList *old_changed_files; - GList *pending_selection; - GHashTable *pending_reveal; + GList *pending_selection; + GHashTable *pending_reveal; - /* whether we are in the active slot */ - gboolean active; + /* whether we are in the active slot */ + gboolean active; - /* loading indicates whether this view has begun loading a directory. - * This flag should need not be set inside subclasses. NautilusFilesView automatically - * sets 'loading' to TRUE before it begins loading a directory's contents and to FALSE - * after it finishes loading the directory and its view. - */ - gboolean loading; - gboolean templates_present; - gboolean scripts_present; + /* loading indicates whether this view has begun loading a directory. + * This flag should need not be set inside subclasses. NautilusFilesView automatically + * sets 'loading' to TRUE before it begins loading a directory's contents and to FALSE + * after it finishes loading the directory and its view. + */ + gboolean loading; + gboolean templates_present; + gboolean scripts_present; - gboolean in_destruction; + gboolean in_destruction; - gboolean sort_directories_first; + gboolean sort_directories_first; - gboolean show_foreign_files; - gboolean show_hidden_files; - gboolean ignore_hidden_file_preferences; + gboolean show_foreign_files; + gboolean show_hidden_files; + gboolean ignore_hidden_file_preferences; - gboolean batching_selection_level; - gboolean selection_changed_while_batched; + gboolean batching_selection_level; + gboolean selection_changed_while_batched; - gboolean selection_was_removed; + gboolean selection_was_removed; - gboolean metadata_for_directory_as_file_pending; - gboolean metadata_for_files_in_directory_pending; + gboolean metadata_for_directory_as_file_pending; + gboolean metadata_for_files_in_directory_pending; - GList *subdirectory_list; + GList *subdirectory_list; - GdkPoint context_menu_position; + GdkPoint context_menu_position; - GMenu *selection_menu; - GMenu *background_menu; + GMenu *selection_menu; + GMenu *background_menu; - GActionGroup *view_action_group; + GActionGroup *view_action_group; - GtkWidget *scrolled_window; + GtkWidget *scrolled_window; - /* Empty states */ - GtkWidget *folder_is_empty_widget; - GtkWidget *no_search_results_widget; + /* Empty states */ + GtkWidget *folder_is_empty_widget; + GtkWidget *no_search_results_widget; - /* Floating bar */ - guint floating_bar_set_status_timeout_id; - guint floating_bar_loading_timeout_id; - GtkWidget *floating_bar; + /* Floating bar */ + guint floating_bar_set_status_timeout_id; + guint floating_bar_loading_timeout_id; + GtkWidget *floating_bar; - /* Toolbar menu */ - NautilusToolbarMenuSections *toolbar_menu_sections; - GtkWidget *sort_menu; - GtkWidget *sort_trash_time; - GtkWidget *visible_columns; - GtkWidget *stop; - GtkWidget *reload; - GtkWidget *zoom_controls_box; - GtkWidget *zoom_level_label; + /* Toolbar menu */ + NautilusToolbarMenuSections *toolbar_menu_sections; + GtkWidget *sort_menu; + GtkWidget *sort_trash_time; + GtkWidget *visible_columns; + GtkWidget *stop; + GtkWidget *reload; + GtkWidget *zoom_controls_box; + GtkWidget *zoom_level_label; - gulong stop_signal_handler; - gulong reload_signal_handler; + gulong stop_signal_handler; + gulong reload_signal_handler; }; -typedef struct { - NautilusFile *file; - NautilusDirectory *directory; +typedef struct +{ + NautilusFile *file; + NautilusDirectory *directory; } FileAndDirectory; /* forward declarations */ -static gboolean display_selection_info_idle_callback (gpointer data); -static void trash_or_delete_files (GtkWindow *parent_window, - const GList *files, - NautilusFilesView *view); -static void load_directory (NautilusFilesView *view, - NautilusDirectory *directory); -static void clipboard_changed_callback (NautilusClipboardMonitor *monitor, - NautilusFilesView *view); -static void open_one_in_new_window (gpointer data, - gpointer callback_data); -static void schedule_update_context_menus (NautilusFilesView *view); -static void remove_update_context_menus_timeout_callback (NautilusFilesView *view); -static void schedule_update_status (NautilusFilesView *view); -static void remove_update_status_idle_callback (NautilusFilesView *view); -static void reset_update_interval (NautilusFilesView *view); -static void schedule_idle_display_of_pending_files (NautilusFilesView *view); -static void unschedule_display_of_pending_files (NautilusFilesView *view); -static void disconnect_model_handlers (NautilusFilesView *view); -static void metadata_for_directory_as_file_ready_callback (NautilusFile *file, - gpointer callback_data); -static void metadata_for_files_in_directory_ready_callback (NautilusDirectory *directory, - GList *files, - gpointer callback_data); -static void nautilus_files_view_trash_state_changed_callback (NautilusTrashMonitor *trash, - gboolean state, - gpointer callback_data); -static void nautilus_files_view_select_file (NautilusFilesView *view, - NautilusFile *file); - -static void update_templates_directory (NautilusFilesView *view); - -static void extract_files (NautilusFilesView *view, +static gboolean display_selection_info_idle_callback (gpointer data); +static void trash_or_delete_files (GtkWindow *parent_window, + const GList *files, + NautilusFilesView *view); +static void load_directory (NautilusFilesView *view, + NautilusDirectory *directory); +static void clipboard_changed_callback (NautilusClipboardMonitor *monitor, + NautilusFilesView *view); +static void open_one_in_new_window (gpointer data, + gpointer callback_data); +static void schedule_update_context_menus (NautilusFilesView *view); +static void remove_update_context_menus_timeout_callback (NautilusFilesView *view); +static void schedule_update_status (NautilusFilesView *view); +static void remove_update_status_idle_callback (NautilusFilesView *view); +static void reset_update_interval (NautilusFilesView *view); +static void schedule_idle_display_of_pending_files (NautilusFilesView *view); +static void unschedule_display_of_pending_files (NautilusFilesView *view); +static void disconnect_model_handlers (NautilusFilesView *view); +static void metadata_for_directory_as_file_ready_callback (NautilusFile *file, + gpointer callback_data); +static void metadata_for_files_in_directory_ready_callback (NautilusDirectory *directory, GList *files, - GFile *destination_directory); -static void extract_files_to_chosen_location (NautilusFilesView *view, - GList *files); + gpointer callback_data); +static void nautilus_files_view_trash_state_changed_callback (NautilusTrashMonitor *trash, + gboolean state, + gpointer callback_data); +static void nautilus_files_view_select_file (NautilusFilesView *view, + NautilusFile *file); + +static void update_templates_directory (NautilusFilesView *view); + +static void extract_files (NautilusFilesView *view, + GList *files, + GFile *destination_directory); +static void extract_files_to_chosen_location (NautilusFilesView *view, + GList *files); -static void nautilus_files_view_check_empty_states (NautilusFilesView *view); +static void nautilus_files_view_check_empty_states (NautilusFilesView *view); -static gboolean nautilus_files_view_is_searching (NautilusView *view); +static gboolean nautilus_files_view_is_searching (NautilusView *view); -static void nautilus_files_view_iface_init (NautilusViewInterface *view); +static void nautilus_files_view_iface_init (NautilusViewInterface *view); -static void set_search_query_internal (NautilusFilesView *files_view, - NautilusQuery *query, - NautilusDirectory *base_model); +static void set_search_query_internal (NautilusFilesView *files_view, + NautilusQuery *query, + NautilusDirectory *base_model); -static gboolean nautilus_files_view_is_read_only (NautilusFilesView *view); +static gboolean nautilus_files_view_is_read_only (NautilusFilesView *view); G_DEFINE_TYPE_WITH_CODE (NautilusFilesView, nautilus_files_view, GTK_TYPE_GRID, G_IMPLEMENT_INTERFACE (NAUTILUS_TYPE_VIEW, nautilus_files_view_iface_init)); -static const struct { - unsigned int keyval; - const char *action; -} extra_view_keybindings [] = { +static const struct +{ + unsigned int keyval; + const char *action; +} extra_view_keybindings [] = +{ #ifdef HAVE_X11_XF86KEYSYM_H - /* View actions */ - { XF86XK_ZoomIn, "zoom-in" }, - { XF86XK_ZoomOut, "zoom-out" }, + /* View actions */ + { XF86XK_ZoomIn, "zoom-in" }, + { XF86XK_ZoomOut, "zoom-out" }, #endif }; @@ -357,69 +362,73 @@ static const struct { static void remove_loading_floating_bar (NautilusFilesView *view) { - if (view->details->floating_bar_loading_timeout_id != 0) { - g_source_remove (view->details->floating_bar_loading_timeout_id); - view->details->floating_bar_loading_timeout_id = 0; - } + if (view->details->floating_bar_loading_timeout_id != 0) + { + g_source_remove (view->details->floating_bar_loading_timeout_id); + view->details->floating_bar_loading_timeout_id = 0; + } - gtk_widget_hide (view->details->floating_bar); - nautilus_floating_bar_cleanup_actions (NAUTILUS_FLOATING_BAR (view->details->floating_bar)); + gtk_widget_hide (view->details->floating_bar); + nautilus_floating_bar_cleanup_actions (NAUTILUS_FLOATING_BAR (view->details->floating_bar)); } static void real_setup_loading_floating_bar (NautilusFilesView *view) { - gboolean disable_chrome; + gboolean disable_chrome; - g_object_get (nautilus_files_view_get_window (view), - "disable-chrome", &disable_chrome, - NULL); + g_object_get (nautilus_files_view_get_window (view), + "disable-chrome", &disable_chrome, + NULL); - if (disable_chrome) { - gtk_widget_hide (view->details->floating_bar); - return; - } + if (disable_chrome) + { + gtk_widget_hide (view->details->floating_bar); + return; + } - nautilus_floating_bar_cleanup_actions (NAUTILUS_FLOATING_BAR (view->details->floating_bar)); - nautilus_floating_bar_set_primary_label (NAUTILUS_FLOATING_BAR (view->details->floating_bar), - nautilus_view_is_searching (NAUTILUS_VIEW (view)) ? _("Searching…") : _("Loading…")); - nautilus_floating_bar_set_details_label (NAUTILUS_FLOATING_BAR (view->details->floating_bar), NULL); - nautilus_floating_bar_set_show_spinner (NAUTILUS_FLOATING_BAR (view->details->floating_bar), view->details->loading); - nautilus_floating_bar_add_action (NAUTILUS_FLOATING_BAR (view->details->floating_bar), - "process-stop-symbolic", - NAUTILUS_FLOATING_BAR_ACTION_ID_STOP); + nautilus_floating_bar_cleanup_actions (NAUTILUS_FLOATING_BAR (view->details->floating_bar)); + nautilus_floating_bar_set_primary_label (NAUTILUS_FLOATING_BAR (view->details->floating_bar), + nautilus_view_is_searching (NAUTILUS_VIEW (view)) ? _("Searching…") : _("Loading…")); + nautilus_floating_bar_set_details_label (NAUTILUS_FLOATING_BAR (view->details->floating_bar), NULL); + nautilus_floating_bar_set_show_spinner (NAUTILUS_FLOATING_BAR (view->details->floating_bar), view->details->loading); + nautilus_floating_bar_add_action (NAUTILUS_FLOATING_BAR (view->details->floating_bar), + "process-stop-symbolic", + NAUTILUS_FLOATING_BAR_ACTION_ID_STOP); - gtk_widget_set_halign (view->details->floating_bar, GTK_ALIGN_END); - gtk_widget_show (view->details->floating_bar); + gtk_widget_set_halign (view->details->floating_bar, GTK_ALIGN_END); + gtk_widget_show (view->details->floating_bar); } static gboolean setup_loading_floating_bar_timeout_cb (gpointer user_data) { - NautilusFilesView *view = user_data; + NautilusFilesView *view = user_data; - view->details->floating_bar_loading_timeout_id = 0; - real_setup_loading_floating_bar (view); + view->details->floating_bar_loading_timeout_id = 0; + real_setup_loading_floating_bar (view); - return FALSE; + return FALSE; } static void setup_loading_floating_bar (NautilusFilesView *view) { - /* setup loading overlay */ - if (view->details->floating_bar_set_status_timeout_id != 0) { - g_source_remove (view->details->floating_bar_set_status_timeout_id); - view->details->floating_bar_set_status_timeout_id = 0; - } + /* setup loading overlay */ + if (view->details->floating_bar_set_status_timeout_id != 0) + { + g_source_remove (view->details->floating_bar_set_status_timeout_id); + view->details->floating_bar_set_status_timeout_id = 0; + } - if (view->details->floating_bar_loading_timeout_id != 0) { - g_source_remove (view->details->floating_bar_loading_timeout_id); - view->details->floating_bar_loading_timeout_id = 0; - } + if (view->details->floating_bar_loading_timeout_id != 0) + { + g_source_remove (view->details->floating_bar_loading_timeout_id); + view->details->floating_bar_loading_timeout_id = 0; + } - view->details->floating_bar_loading_timeout_id = - g_timeout_add (FLOATING_BAR_LOADING_DELAY, setup_loading_floating_bar_timeout_cb, view); + view->details->floating_bar_loading_timeout_id = + g_timeout_add (FLOATING_BAR_LOADING_DELAY, setup_loading_floating_bar_timeout_cb, view); } static void @@ -427,10 +436,11 @@ floating_bar_action_cb (NautilusFloatingBar *floating_bar, gint action, NautilusFilesView *view) { - if (action == NAUTILUS_FLOATING_BAR_ACTION_ID_STOP) { - remove_loading_floating_bar (view); - nautilus_window_slot_stop_loading (view->details->slot); - } + if (action == NAUTILUS_FLOATING_BAR_ACTION_ID_STOP) + { + remove_loading_floating_bar (view); + nautilus_window_slot_stop_loading (view->details->slot); + } } static void @@ -438,60 +448,64 @@ real_floating_bar_set_short_status (NautilusFilesView *view, const gchar *primary_status, const gchar *detail_status) { - gboolean disable_chrome; + gboolean disable_chrome; - if (view->details->loading) - return; + if (view->details->loading) + { + return; + } - nautilus_floating_bar_cleanup_actions (NAUTILUS_FLOATING_BAR (view->details->floating_bar)); - nautilus_floating_bar_set_show_spinner (NAUTILUS_FLOATING_BAR (view->details->floating_bar), - FALSE); + nautilus_floating_bar_cleanup_actions (NAUTILUS_FLOATING_BAR (view->details->floating_bar)); + nautilus_floating_bar_set_show_spinner (NAUTILUS_FLOATING_BAR (view->details->floating_bar), + FALSE); - g_object_get (nautilus_files_view_get_window (view), - "disable-chrome", &disable_chrome, - NULL); + g_object_get (nautilus_files_view_get_window (view), + "disable-chrome", &disable_chrome, + NULL); - if ((primary_status == NULL && detail_status == NULL) || disable_chrome) { - gtk_widget_hide (view->details->floating_bar); - nautilus_floating_bar_remove_hover_timeout (NAUTILUS_FLOATING_BAR (view->details->floating_bar)); - return; - } + if ((primary_status == NULL && detail_status == NULL) || disable_chrome) + { + gtk_widget_hide (view->details->floating_bar); + nautilus_floating_bar_remove_hover_timeout (NAUTILUS_FLOATING_BAR (view->details->floating_bar)); + return; + } - nautilus_floating_bar_set_labels (NAUTILUS_FLOATING_BAR (view->details->floating_bar), - primary_status, - detail_status); + nautilus_floating_bar_set_labels (NAUTILUS_FLOATING_BAR (view->details->floating_bar), + primary_status, + detail_status); - gtk_widget_show (view->details->floating_bar); + gtk_widget_show (view->details->floating_bar); } -typedef struct { - gchar *primary_status; - gchar *detail_status; - NautilusFilesView *view; +typedef struct +{ + gchar *primary_status; + gchar *detail_status; + NautilusFilesView *view; } FloatingBarSetStatusData; static void floating_bar_set_status_data_free (gpointer data) { - FloatingBarSetStatusData *status_data = data; + FloatingBarSetStatusData *status_data = data; - g_free (status_data->primary_status); - g_free (status_data->detail_status); + g_free (status_data->primary_status); + g_free (status_data->detail_status); - g_slice_free (FloatingBarSetStatusData, data); + g_slice_free (FloatingBarSetStatusData, data); } static gboolean floating_bar_set_status_timeout_cb (gpointer data) { - FloatingBarSetStatusData *status_data = data; + FloatingBarSetStatusData *status_data = data; - status_data->view->details->floating_bar_set_status_timeout_id = 0; - real_floating_bar_set_short_status (status_data->view, - status_data->primary_status, - status_data->detail_status); + status_data->view->details->floating_bar_set_status_timeout_id = 0; + real_floating_bar_set_short_status (status_data->view, + status_data->primary_status, + status_data->detail_status); - return FALSE; + return FALSE; } static void @@ -499,47 +513,49 @@ set_floating_bar_status (NautilusFilesView *view, const gchar *primary_status, const gchar *detail_status) { - GtkSettings *settings; - gint double_click_time; - FloatingBarSetStatusData *status_data; - - if (view->details->floating_bar_set_status_timeout_id != 0) { - g_source_remove (view->details->floating_bar_set_status_timeout_id); - view->details->floating_bar_set_status_timeout_id = 0; - } - - settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (view))); - g_object_get (settings, - "gtk-double-click-time", &double_click_time, - NULL); - - status_data = g_slice_new0 (FloatingBarSetStatusData); - status_data->primary_status = g_strdup (primary_status); - status_data->detail_status = g_strdup (detail_status); - status_data->view = view; - - /* waiting for half of the double-click-time before setting - * the status seems to be a good approximation of not setting it - * too often and not delaying the statusbar too much. - */ - view->details->floating_bar_set_status_timeout_id = - g_timeout_add_full (G_PRIORITY_DEFAULT, - (guint) (double_click_time / 2), - floating_bar_set_status_timeout_cb, - status_data, - floating_bar_set_status_data_free); + GtkSettings *settings; + gint double_click_time; + FloatingBarSetStatusData *status_data; + + if (view->details->floating_bar_set_status_timeout_id != 0) + { + g_source_remove (view->details->floating_bar_set_status_timeout_id); + view->details->floating_bar_set_status_timeout_id = 0; + } + + settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (view))); + g_object_get (settings, + "gtk-double-click-time", &double_click_time, + NULL); + + status_data = g_slice_new0 (FloatingBarSetStatusData); + status_data->primary_status = g_strdup (primary_status); + status_data->detail_status = g_strdup (detail_status); + status_data->view = view; + + /* waiting for half of the double-click-time before setting + * the status seems to be a good approximation of not setting it + * too often and not delaying the statusbar too much. + */ + view->details->floating_bar_set_status_timeout_id = + g_timeout_add_full (G_PRIORITY_DEFAULT, + (guint) (double_click_time / 2), + floating_bar_set_status_timeout_cb, + status_data, + floating_bar_set_status_data_free); } static char * real_get_backing_uri (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - if (view->details->model == NULL) { - return NULL; - } + if (view->details->model == NULL) + { + return NULL; + } - return nautilus_directory_get_uri (view->details->model); + return nautilus_directory_get_uri (view->details->model); } /** @@ -553,9 +569,9 @@ real_get_backing_uri (NautilusFilesView *view) char * nautilus_files_view_get_backing_uri (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_backing_uri (view); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_backing_uri (view); } /** @@ -567,41 +583,42 @@ nautilus_files_view_get_backing_uri (NautilusFilesView *view) static void nautilus_files_view_select_all (NautilusFilesView *view) { - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->select_all (view); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->select_all (view); } static void nautilus_files_view_select_first (NautilusFilesView *view) { - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->select_first (view); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->select_first (view); } static void -nautilus_files_view_call_set_selection (NautilusFilesView *view, GList *selection) +nautilus_files_view_call_set_selection (NautilusFilesView *view, + GList *selection) { - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->set_selection (view, selection); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->set_selection (view, selection); } static GList * nautilus_files_view_get_selection_for_file_transfer (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_selection_for_file_transfer (view); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_selection_for_file_transfer (view); } static void nautilus_files_view_invert_selection (NautilusFilesView *view) { - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->invert_selection (view); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->invert_selection (view); } /** @@ -612,17 +629,17 @@ nautilus_files_view_invert_selection (NautilusFilesView *view) static void nautilus_files_view_reveal_selection (NautilusFilesView *view) { - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->reveal_selection (view); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->reveal_selection (view); } static gboolean -nautilus_files_view_using_manual_layout (NautilusFilesView *view) +nautilus_files_view_using_manual_layout (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->using_manual_layout (view); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->using_manual_layout (view); } /** @@ -633,12 +650,12 @@ nautilus_files_view_using_manual_layout (NautilusFilesView *view) * * Returns: (transfer none): the #Gicon that represents @view */ -static GIcon* +static GIcon * nautilus_files_view_get_icon (NautilusView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_icon (NAUTILUS_FILES_VIEW (view)); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_icon (NAUTILUS_FILES_VIEW (view)); } /** @@ -654,61 +671,63 @@ nautilus_files_view_get_icon (NautilusView *view) static NautilusToolbarMenuSections * nautilus_files_view_get_toolbar_menu_sections (NautilusView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - return NAUTILUS_FILES_VIEW (view)->details->toolbar_menu_sections; + return NAUTILUS_FILES_VIEW (view)->details->toolbar_menu_sections; } static gboolean showing_trash_directory (NautilusFilesView *view) { - NautilusFile *file; + NautilusFile *file; - file = nautilus_files_view_get_directory_as_file (view); - if (file != NULL) { - return nautilus_file_is_in_trash (file); - } - return FALSE; + file = nautilus_files_view_get_directory_as_file (view); + if (file != NULL) + { + return nautilus_file_is_in_trash (file); + } + return FALSE; } static gboolean showing_recent_directory (NautilusFilesView *view) { - NautilusFile *file; + NautilusFile *file; - file = nautilus_files_view_get_directory_as_file (view); - if (file != NULL) { - return nautilus_file_is_in_recent (file); - } - return FALSE; + file = nautilus_files_view_get_directory_as_file (view); + if (file != NULL) + { + return nautilus_file_is_in_recent (file); + } + return FALSE; } static gboolean nautilus_files_view_supports_creating_files (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); - return !nautilus_files_view_is_read_only (view) - && !showing_trash_directory (view) - && !showing_recent_directory (view); + return !nautilus_files_view_is_read_only (view) + && !showing_trash_directory (view) + && !showing_recent_directory (view); } static gboolean nautilus_files_view_supports_extract_here (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); - return nautilus_files_view_supports_creating_files (view) - && !nautilus_directory_is_remote (view->details->model) - && !nautilus_view_is_searching (NAUTILUS_VIEW (view)); + return nautilus_files_view_supports_creating_files (view) + && !nautilus_directory_is_remote (view->details->model) + && !nautilus_view_is_searching (NAUTILUS_VIEW (view)); } static gboolean nautilus_files_view_is_empty (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->is_empty (view); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->is_empty (view); } /** @@ -719,15 +738,16 @@ nautilus_files_view_is_empty (NautilusFilesView *view) **/ void nautilus_files_view_bump_zoom_level (NautilusFilesView *view, - int zoom_increment) + int zoom_increment) { - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - if (!nautilus_files_view_supports_zooming (view)) { - return; - } + if (!nautilus_files_view_supports_zooming (view)) + { + return; + } - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->bump_zoom_level (view, zoom_increment); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->bump_zoom_level (view, zoom_increment); } /** @@ -742,13 +762,14 @@ nautilus_files_view_bump_zoom_level (NautilusFilesView *view, gboolean nautilus_files_view_can_zoom_in (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); - if (!nautilus_files_view_supports_zooming (view)) { - return FALSE; - } + if (!nautilus_files_view_supports_zooming (view)) + { + return FALSE; + } - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->can_zoom_in (view); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->can_zoom_in (view); } /** @@ -763,21 +784,22 @@ nautilus_files_view_can_zoom_in (NautilusFilesView *view) gboolean nautilus_files_view_can_zoom_out (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); - if (!nautilus_files_view_supports_zooming (view)) { - return FALSE; - } + if (!nautilus_files_view_supports_zooming (view)) + { + return FALSE; + } - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->can_zoom_out (view); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->can_zoom_out (view); } gboolean nautilus_files_view_supports_zooming (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); - return view->details->supports_zooming; + return view->details->supports_zooming; } /** @@ -788,50 +810,54 @@ nautilus_files_view_supports_zooming (NautilusFilesView *view) static void nautilus_files_view_restore_standard_zoom_level (NautilusFilesView *view) { - if (!nautilus_files_view_supports_zooming (view)) - return; + if (!nautilus_files_view_supports_zooming (view)) + { + return; + } - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->restore_standard_zoom_level (view); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->restore_standard_zoom_level (view); } static gfloat nautilus_files_view_get_zoom_level_percentage (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), 1); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), 1); - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_zoom_level_percentage (view); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_zoom_level_percentage (view); } gboolean nautilus_files_view_is_searching (NautilusView *view) { - NautilusFilesView *files_view; + NautilusFilesView *files_view; - files_view = NAUTILUS_FILES_VIEW (view); + files_view = NAUTILUS_FILES_VIEW (view); - if (!files_view->details->model) - return FALSE; + if (!files_view->details->model) + { + return FALSE; + } - return NAUTILUS_IS_SEARCH_DIRECTORY (files_view->details->model); + return NAUTILUS_IS_SEARCH_DIRECTORY (files_view->details->model); } guint nautilus_files_view_get_view_id (NautilusFilesView *view) { - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_view_id (view); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_view_id (view); } char * nautilus_files_view_get_first_visible_file (NautilusFilesView *view) { - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_first_visible_file (view); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_first_visible_file (view); } void nautilus_files_view_scroll_to_file (NautilusFilesView *view, - const char *uri) + const char *uri) { - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->scroll_to_file (view, uri); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->scroll_to_file (view, uri); } /** @@ -846,36 +872,39 @@ nautilus_files_view_scroll_to_file (NautilusFilesView *view, * Return value: GList of NautilusFile pointers representing the selection. * **/ -static GList* +static GList * nautilus_files_view_get_selection (NautilusView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_selection (NAUTILUS_FILES_VIEW (view)); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_selection (NAUTILUS_FILES_VIEW (view)); } -typedef struct { - NautilusFile *file; - NautilusFilesView *directory_view; +typedef struct +{ + NautilusFile *file; + NautilusFilesView *directory_view; } ScriptLaunchParameters; -typedef struct { - NautilusFile *file; - NautilusFilesView *directory_view; +typedef struct +{ + NautilusFile *file; + NautilusFilesView *directory_view; } CreateTemplateParameters; static GList * file_and_directory_list_to_files (GList *fad_list) { - GList *res, *l; - FileAndDirectory *fad; + GList *res, *l; + FileAndDirectory *fad; - res = NULL; - for (l = fad_list; l != NULL; l = l->next) { - fad = l->data; - res = g_list_prepend (res, nautilus_file_ref (fad->file)); - } - return g_list_reverse (res); + res = NULL; + for (l = fad_list; l != NULL; l = l->next) + { + fad = l->data; + res = g_list_prepend (res, nautilus_file_ref (fad->file)); + } + return g_list_reverse (res); } @@ -883,115 +912,117 @@ static GList * file_and_directory_list_from_files (NautilusDirectory *directory, GList *files) { - GList *res, *l; - FileAndDirectory *fad; + GList *res, *l; + FileAndDirectory *fad; - res = NULL; - for (l = files; l != NULL; l = l->next) { - fad = g_new0 (FileAndDirectory, 1); - fad->directory = nautilus_directory_ref (directory); - fad->file = nautilus_file_ref (l->data); - res = g_list_prepend (res, fad); - } - return g_list_reverse (res); + res = NULL; + for (l = files; l != NULL; l = l->next) + { + fad = g_new0 (FileAndDirectory, 1); + fad->directory = nautilus_directory_ref (directory); + fad->file = nautilus_file_ref (l->data); + res = g_list_prepend (res, fad); + } + return g_list_reverse (res); } static void file_and_directory_free (FileAndDirectory *fad) { - nautilus_directory_unref (fad->directory); - nautilus_file_unref (fad->file); - g_free (fad); + nautilus_directory_unref (fad->directory); + nautilus_file_unref (fad->file); + g_free (fad); } static void file_and_directory_list_free (GList *list) { - GList *l; + GList *l; - for (l = list; l != NULL; l = l->next) { - file_and_directory_free (l->data); - } + for (l = list; l != NULL; l = l->next) + { + file_and_directory_free (l->data); + } - g_list_free (list); + g_list_free (list); } static gboolean file_and_directory_equal (gconstpointer v1, gconstpointer v2) { - const FileAndDirectory *fad1, *fad2; - fad1 = v1; - fad2 = v2; + const FileAndDirectory *fad1, *fad2; + fad1 = v1; + fad2 = v2; - return (fad1->file == fad2->file && - fad1->directory == fad2->directory); + return (fad1->file == fad2->file && + fad1->directory == fad2->directory); } static guint -file_and_directory_hash (gconstpointer v) +file_and_directory_hash (gconstpointer v) { - const FileAndDirectory *fad; + const FileAndDirectory *fad; - fad = v; - return GPOINTER_TO_UINT (fad->file) ^ GPOINTER_TO_UINT (fad->directory); + fad = v; + return GPOINTER_TO_UINT (fad->file) ^ GPOINTER_TO_UINT (fad->directory); } static ScriptLaunchParameters * -script_launch_parameters_new (NautilusFile *file, +script_launch_parameters_new (NautilusFile *file, NautilusFilesView *directory_view) { - ScriptLaunchParameters *result; + ScriptLaunchParameters *result; - result = g_new0 (ScriptLaunchParameters, 1); - result->directory_view = directory_view; - nautilus_file_ref (file); - result->file = file; + result = g_new0 (ScriptLaunchParameters, 1); + result->directory_view = directory_view; + nautilus_file_ref (file); + result->file = file; - return result; + return result; } static void script_launch_parameters_free (ScriptLaunchParameters *parameters) { - nautilus_file_unref (parameters->file); - g_free (parameters); + nautilus_file_unref (parameters->file); + g_free (parameters); } static CreateTemplateParameters * create_template_parameters_new (NautilusFile *file, NautilusFilesView *directory_view) { - CreateTemplateParameters *result; + CreateTemplateParameters *result; - result = g_new0 (CreateTemplateParameters, 1); - result->directory_view = directory_view; - nautilus_file_ref (file); - result->file = file; + result = g_new0 (CreateTemplateParameters, 1); + result->directory_view = directory_view; + nautilus_file_ref (file); + result->file = file; - return result; + return result; } static void create_templates_parameters_free (CreateTemplateParameters *parameters) { - nautilus_file_unref (parameters->file); - g_free (parameters); + nautilus_file_unref (parameters->file); + g_free (parameters); } NautilusWindow * -nautilus_files_view_get_window (NautilusFilesView *view) +nautilus_files_view_get_window (NautilusFilesView *view) { - return nautilus_window_slot_get_window (view->details->slot); + return nautilus_window_slot_get_window (view->details->slot); } NautilusWindowSlot * -nautilus_files_view_get_nautilus_window_slot (NautilusFilesView *view) +nautilus_files_view_get_nautilus_window_slot (NautilusFilesView *view) { - g_assert (view->details->slot != NULL); + g_assert (view->details->slot != NULL); - return view->details->slot; + return view->details->slot; } /* Returns the GtkWindow that this directory view occupies, or NULL @@ -1001,16 +1032,17 @@ nautilus_files_view_get_nautilus_window_slot (NautilusFilesView *view) static GtkWindow * nautilus_files_view_get_containing_window (NautilusFilesView *view) { - GtkWidget *window; + GtkWidget *window; - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - window = gtk_widget_get_ancestor (GTK_WIDGET (view), GTK_TYPE_WINDOW); - if (window == NULL) { - return NULL; - } + window = gtk_widget_get_ancestor (GTK_WIDGET (view), GTK_TYPE_WINDOW); + if (window == NULL) + { + return NULL; + } - return GTK_WINDOW (window); + return GTK_WINDOW (window); } static gboolean @@ -1018,63 +1050,68 @@ nautilus_files_view_confirm_multiple (GtkWindow *parent_window, int count, gboolean tabs) { - GtkDialog *dialog; - char *prompt; - char *detail; - int response; - - if (count <= SILENT_WINDOW_OPEN_LIMIT) { - return TRUE; - } + GtkDialog *dialog; + char *prompt; + char *detail; + int response; - prompt = _("Are you sure you want to open all files?"); - if (tabs) { - detail = g_strdup_printf (ngettext("This will open %'d separate tab.", - "This will open %'d separate tabs.", count), count); - } else { - detail = g_strdup_printf (ngettext("This will open %'d separate window.", - "This will open %'d separate windows.", count), count); - } - dialog = eel_show_yes_no_dialog (prompt, detail, - _("_OK"), _("_Cancel"), - parent_window); - g_free (detail); - - response = gtk_dialog_run (dialog); - gtk_widget_destroy (GTK_WIDGET (dialog)); - - return response == GTK_RESPONSE_YES; + if (count <= SILENT_WINDOW_OPEN_LIMIT) + { + return TRUE; + } + + prompt = _("Are you sure you want to open all files?"); + if (tabs) + { + detail = g_strdup_printf (ngettext ("This will open %'d separate tab.", + "This will open %'d separate tabs.", count), count); + } + else + { + detail = g_strdup_printf (ngettext ("This will open %'d separate window.", + "This will open %'d separate windows.", count), count); + } + dialog = eel_show_yes_no_dialog (prompt, detail, + _("_OK"), _("_Cancel"), + parent_window); + g_free (detail); + + response = gtk_dialog_run (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); + + return response == GTK_RESPONSE_YES; } static gboolean selection_not_empty_in_menu_callback (NautilusFilesView *view, GList *selection) { - if (selection != NULL) { - return TRUE; - } + if (selection != NULL) + { + return TRUE; + } - return FALSE; + return FALSE; } static char * get_view_directory (NautilusFilesView *view) { - char *uri, *path; - GFile *f; + char *uri, *path; + GFile *f; - uri = nautilus_directory_get_uri (view->details->model); - if (eel_uri_is_desktop (uri)) { - g_free (uri); - uri = nautilus_get_desktop_directory_uri (); - - } - f = g_file_new_for_uri (uri); - path = g_file_get_path (f); - g_object_unref (f); + uri = nautilus_directory_get_uri (view->details->model); + if (eel_uri_is_desktop (uri)) + { g_free (uri); + uri = nautilus_get_desktop_directory_uri (); + } + f = g_file_new_for_uri (uri); + path = g_file_get_path (f); + g_object_unref (f); + g_free (uri); - return path; + return path; } void @@ -1082,36 +1119,38 @@ nautilus_files_view_preview_files (NautilusFilesView *view, GList *files, GArray *locations) { - gchar *uri; - guint xid = 0; - GtkWidget *toplevel; - GdkWindow *window; + gchar *uri; + guint xid = 0; + GtkWidget *toplevel; + GdkWindow *window; - uri = nautilus_file_get_uri (files->data); - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view)); + uri = nautilus_file_get_uri (files->data); + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view)); #ifdef GDK_WINDOWING_X11 - window = gtk_widget_get_window (toplevel); - if (GDK_IS_X11_WINDOW (window)) - xid = gdk_x11_window_get_xid (gtk_widget_get_window (toplevel)); + window = gtk_widget_get_window (toplevel); + if (GDK_IS_X11_WINDOW (window)) + { + xid = gdk_x11_window_get_xid (gtk_widget_get_window (toplevel)); + } #endif - nautilus_previewer_call_show_file (uri, xid, TRUE); + nautilus_previewer_call_show_file (uri, xid, TRUE); - g_free (uri); + g_free (uri); } void nautilus_files_view_activate_selection (NautilusFilesView *view) { - GList *selection; + GList *selection; - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - nautilus_files_view_activate_files (view, - selection, - 0, - TRUE); - nautilus_file_list_free (selection); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + nautilus_files_view_activate_files (view, + selection, + 0, + TRUE); + nautilus_file_list_free (selection); } void @@ -1120,33 +1159,36 @@ nautilus_files_view_activate_files (NautilusFilesView *view, NautilusWindowOpenFlags flags, gboolean confirm_multiple) { - GList *files_to_extract; - GList *files_to_activate; - char *path; + GList *files_to_extract; + GList *files_to_activate; + char *path; - files_to_extract = nautilus_file_list_filter (files, - &files_to_activate, - (NautilusFileFilterFunc)nautilus_mime_file_extracts, - NULL); + files_to_extract = nautilus_file_list_filter (files, + &files_to_activate, + (NautilusFileFilterFunc) nautilus_mime_file_extracts, + NULL); - if (nautilus_files_view_supports_extract_here (view)) { - extract_files (view, files_to_extract, - nautilus_view_get_location (NAUTILUS_VIEW (view))); - } else { - extract_files_to_chosen_location (view, files_to_extract); - } + if (nautilus_files_view_supports_extract_here (view)) + { + extract_files (view, files_to_extract, + nautilus_view_get_location (NAUTILUS_VIEW (view))); + } + else + { + extract_files_to_chosen_location (view, files_to_extract); + } - path = get_view_directory (view); - nautilus_mime_activate_files (nautilus_files_view_get_containing_window (view), - view->details->slot, - files_to_activate, - path, - flags, - confirm_multiple); + path = get_view_directory (view); + nautilus_mime_activate_files (nautilus_files_view_get_containing_window (view), + view->details->slot, + files_to_activate, + path, + flags, + confirm_multiple); - g_free (path); - g_list_free (files_to_extract); - g_list_free (files_to_activate); + g_free (path); + g_list_free (files_to_extract); + g_list_free (files_to_activate); } static void @@ -1154,33 +1196,37 @@ nautilus_files_view_activate_file (NautilusFilesView *view, NautilusFile *file, NautilusWindowOpenFlags flags) { - char *path; + char *path; - if (nautilus_mime_file_extracts (file)) { - GList *files = NULL; + if (nautilus_mime_file_extracts (file)) + { + GList *files = NULL; - files = g_list_prepend (files, file); + files = g_list_prepend (files, file); - if (nautilus_files_view_supports_extract_here (view)) { - extract_files (view, files, - nautilus_view_get_location (NAUTILUS_VIEW (view))); - } else { - extract_files_to_chosen_location (view, files); - } + if (nautilus_files_view_supports_extract_here (view)) + { + extract_files (view, files, + nautilus_view_get_location (NAUTILUS_VIEW (view))); + } + else + { + extract_files_to_chosen_location (view, files); + } - g_list_free (files); + g_list_free (files); - return; - } + return; + } - path = get_view_directory (view); - nautilus_mime_activate_file (nautilus_files_view_get_containing_window (view), - view->details->slot, - file, - path, - flags); + path = get_view_directory (view); + nautilus_mime_activate_file (nautilus_files_view_get_containing_window (view), + view->details->slot, + file, + path, + flags); - g_free (path); + g_free (path); } static void @@ -1188,27 +1234,27 @@ action_open_with_default_application (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (user_data); - nautilus_files_view_activate_selection (view); + view = NAUTILUS_FILES_VIEW (user_data); + nautilus_files_view_activate_selection (view); } static void action_open_file_and_close_window (GSimpleAction *action, GVariant *state, gpointer user_data) { - GList *selection; - NautilusFilesView *view; + GList *selection; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - nautilus_files_view_activate_files (view, - selection, - NAUTILUS_WINDOW_OPEN_FLAG_CLOSE_BEHIND, - TRUE); - nautilus_file_list_free (selection); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + nautilus_files_view_activate_files (view, + selection, + NAUTILUS_WINDOW_OPEN_FLAG_CLOSE_BEHIND, + TRUE); + nautilus_file_list_free (selection); } static void @@ -1216,9 +1262,9 @@ got_it_clicked (GtkDialog *dialog, gint response_id, gpointer user_data) { - g_settings_set_boolean (nautilus_preferences, - NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORTCUT_CHANGED_DIALOG, - FALSE); + g_settings_set_boolean (nautilus_preferences, + NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORTCUT_CHANGED_DIALOG, + FALSE); } static void @@ -1226,59 +1272,62 @@ action_show_move_to_trash_shortcut_changed_dialog (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GtkWindow *dialog; - GtkBuilder *builder; - gboolean show_dialog_preference; + NautilusFilesView *view; + GtkWindow *dialog; + GtkBuilder *builder; + gboolean show_dialog_preference; - view = NAUTILUS_FILES_VIEW (user_data); - show_dialog_preference = g_settings_get_boolean (nautilus_preferences, - NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORTCUT_CHANGED_DIALOG); - if (show_dialog_preference) { - builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-move-to-trash-shortcut-changed.ui"); - dialog = GTK_WINDOW (gtk_builder_get_object (builder, "move_to_trash_shortcut_changed_dialog")); + view = NAUTILUS_FILES_VIEW (user_data); + show_dialog_preference = g_settings_get_boolean (nautilus_preferences, + NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORTCUT_CHANGED_DIALOG); + if (show_dialog_preference) + { + builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-move-to-trash-shortcut-changed.ui"); + dialog = GTK_WINDOW (gtk_builder_get_object (builder, "move_to_trash_shortcut_changed_dialog")); - gtk_window_set_transient_for (dialog, GTK_WINDOW (nautilus_files_view_get_window (view))); - g_signal_connect (dialog, "response", - G_CALLBACK (got_it_clicked), - view); + gtk_window_set_transient_for (dialog, GTK_WINDOW (nautilus_files_view_get_window (view))); + g_signal_connect (dialog, "response", + G_CALLBACK (got_it_clicked), + view); - gtk_widget_show (GTK_WIDGET (dialog)); - gtk_dialog_run(GTK_DIALOG (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_widget_show (GTK_WIDGET (dialog)); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); - g_object_unref (builder); - } + g_object_unref (builder); + } } static void action_open_item_location (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GList *selection; - NautilusFile *item; - GFile *activation_location; - NautilusFile *activation_file; - NautilusFile *location; + NautilusFilesView *view; + GList *selection; + NautilusFile *item; + GFile *activation_location; + NautilusFile *activation_file; + NautilusFile *location; - view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + view = NAUTILUS_FILES_VIEW (user_data); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - if (!selection) - return; + if (!selection) + { + return; + } - item = NAUTILUS_FILE (selection->data); - activation_location = nautilus_file_get_activation_location (item); - activation_file = nautilus_file_get (activation_location); - location = nautilus_file_get_parent (activation_file); + item = NAUTILUS_FILE (selection->data); + activation_location = nautilus_file_get_activation_location (item); + activation_file = nautilus_file_get (activation_location); + location = nautilus_file_get_parent (activation_file); - nautilus_files_view_activate_file (view, location, 0); + nautilus_files_view_activate_file (view, location, 0); - nautilus_file_unref (location); - nautilus_file_unref (activation_file); - g_object_unref (activation_location); - nautilus_file_list_free (selection); + nautilus_file_unref (location); + nautilus_file_unref (activation_file); + g_object_unref (activation_location); + nautilus_file_list_free (selection); } static void @@ -1286,24 +1335,25 @@ action_open_item_new_tab (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GList *selection; - GtkWindow *window; + NautilusFilesView *view; + GList *selection; + GtkWindow *window; - view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + view = NAUTILUS_FILES_VIEW (user_data); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - window = nautilus_files_view_get_containing_window (view); + window = nautilus_files_view_get_containing_window (view); - if (nautilus_files_view_confirm_multiple (window, g_list_length (selection), TRUE)) { - nautilus_files_view_activate_files (view, - selection, - NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB | - NAUTILUS_WINDOW_OPEN_FLAG_DONT_MAKE_ACTIVE, - FALSE); - } + if (nautilus_files_view_confirm_multiple (window, g_list_length (selection), TRUE)) + { + nautilus_files_view_activate_files (view, + selection, + NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB | + NAUTILUS_WINDOW_OPEN_FLAG_DONT_MAKE_ACTIVE, + FALSE); + } - nautilus_file_list_free (selection); + nautilus_file_list_free (selection); } static void @@ -1311,65 +1361,67 @@ app_chooser_dialog_response_cb (GtkDialog *dialog, gint response_id, gpointer user_data) { - GtkWindow *parent_window; - GList *files; - GAppInfo *info; + GtkWindow *parent_window; + GList *files; + GAppInfo *info; - parent_window = user_data; - files = g_object_get_data (G_OBJECT (dialog), "directory-view:files"); + parent_window = user_data; + files = g_object_get_data (G_OBJECT (dialog), "directory-view:files"); - if (response_id != GTK_RESPONSE_OK) - goto out; + if (response_id != GTK_RESPONSE_OK) + { + goto out; + } - info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (dialog)); + info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (dialog)); - g_signal_emit_by_name (nautilus_signaller_get_current (), "mime-data-changed"); + g_signal_emit_by_name (nautilus_signaller_get_current (), "mime-data-changed"); - nautilus_launch_application (info, files, parent_window); + nautilus_launch_application (info, files, parent_window); - g_object_unref (info); + g_object_unref (info); out: - gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); } static void choose_program (NautilusFilesView *view, GList *files) { - GtkWidget *dialog; - gchar *mime_type; - GtkWindow *parent_window; + GtkWidget *dialog; + gchar *mime_type; + GtkWindow *parent_window; - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - mime_type = nautilus_file_get_mime_type (files->data); - parent_window = nautilus_files_view_get_containing_window (view); + mime_type = nautilus_file_get_mime_type (files->data); + parent_window = nautilus_files_view_get_containing_window (view); - dialog = gtk_app_chooser_dialog_new_for_content_type (parent_window, - GTK_DIALOG_MODAL | - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_USE_HEADER_BAR, - mime_type); - g_object_set_data_full (G_OBJECT (dialog), - "directory-view:files", - files, - (GDestroyNotify) nautilus_file_list_free); - gtk_widget_show (dialog); + dialog = gtk_app_chooser_dialog_new_for_content_type (parent_window, + GTK_DIALOG_MODAL | + GTK_DIALOG_DESTROY_WITH_PARENT | + GTK_DIALOG_USE_HEADER_BAR, + mime_type); + g_object_set_data_full (G_OBJECT (dialog), + "directory-view:files", + files, + (GDestroyNotify) nautilus_file_list_free); + gtk_widget_show (dialog); - g_signal_connect_object (dialog, "response", - G_CALLBACK (app_chooser_dialog_response_cb), - parent_window, 0); + g_signal_connect_object (dialog, "response", + G_CALLBACK (app_chooser_dialog_response_cb), + parent_window, 0); } static void open_with_other_program (NautilusFilesView *view) { - GList *selection; + GList *selection; - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - choose_program (view, selection); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + choose_program (view, selection); } static void @@ -1377,28 +1429,29 @@ action_open_with_other_application (GSimpleAction *action, GVariant *state, gpointer user_data) { - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - open_with_other_program (NAUTILUS_FILES_VIEW (user_data)); + open_with_other_program (NAUTILUS_FILES_VIEW (user_data)); } static void trash_or_delete_selected_files (NautilusFilesView *view) { - GList *selection; + GList *selection; - /* This might be rapidly called multiple times for the same selection - * when using keybindings. So we remember if the current selection - * was already removed (but the view doesn't know about it yet). - */ - if (!view->details->selection_was_removed) { - selection = nautilus_files_view_get_selection_for_file_transfer (view); - trash_or_delete_files (nautilus_files_view_get_containing_window (view), - selection, - view); - nautilus_file_list_free (selection); - view->details->selection_was_removed = TRUE; - } + /* This might be rapidly called multiple times for the same selection + * when using keybindings. So we remember if the current selection + * was already removed (but the view doesn't know about it yet). + */ + if (!view->details->selection_was_removed) + { + selection = nautilus_files_view_get_selection_for_file_transfer (view); + trash_or_delete_files (nautilus_files_view_get_containing_window (view), + selection, + view); + nautilus_file_list_free (selection); + view->details->selection_was_removed = TRUE; + } } static void @@ -1406,7 +1459,7 @@ action_move_to_trash (GSimpleAction *action, GVariant *state, gpointer user_data) { - trash_or_delete_selected_files (NAUTILUS_FILES_VIEW (user_data)); + trash_or_delete_selected_files (NAUTILUS_FILES_VIEW (user_data)); } static void @@ -1414,35 +1467,37 @@ action_remove_from_recent (GSimpleAction *action, GVariant *state, gpointer user_data) { - /* TODO:implement a set of functions for this, is very confusing to - * call trash_or_delete_file to remove from recent, even if it does like - * that not deleting/moving the files to trash */ - trash_or_delete_selected_files (NAUTILUS_FILES_VIEW (user_data)); + /* TODO:implement a set of functions for this, is very confusing to + * call trash_or_delete_file to remove from recent, even if it does like + * that not deleting/moving the files to trash */ + trash_or_delete_selected_files (NAUTILUS_FILES_VIEW (user_data)); } static void delete_selected_files (NautilusFilesView *view) { - GList *selection; - GList *node; - GList *locations; + GList *selection; + GList *node; + GList *locations; - selection = nautilus_files_view_get_selection_for_file_transfer (view); - if (selection == NULL) { - return; - } + selection = nautilus_files_view_get_selection_for_file_transfer (view); + if (selection == NULL) + { + return; + } - locations = NULL; - for (node = selection; node != NULL; node = node->next) { - locations = g_list_prepend (locations, - nautilus_file_get_location ((NautilusFile *) node->data)); - } - locations = g_list_reverse (locations); + locations = NULL; + for (node = selection; node != NULL; node = node->next) + { + locations = g_list_prepend (locations, + nautilus_file_get_location ((NautilusFile *) node->data)); + } + locations = g_list_reverse (locations); - nautilus_file_operations_delete (locations, nautilus_files_view_get_containing_window (view), NULL, NULL); + nautilus_file_operations_delete (locations, nautilus_files_view_get_containing_window (view), NULL, NULL); - g_list_free_full (locations, g_object_unref); - nautilus_file_list_free (selection); + g_list_free_full (locations, g_object_unref); + nautilus_file_list_free (selection); } static void @@ -1450,7 +1505,7 @@ action_delete (GSimpleAction *action, GVariant *state, gpointer user_data) { - delete_selected_files (NAUTILUS_FILES_VIEW (user_data)); + delete_selected_files (NAUTILUS_FILES_VIEW (user_data)); } static void @@ -1458,17 +1513,16 @@ action_restore_from_trash (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GList *selection; + NautilusFilesView *view; + GList *selection; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_files_view_get_selection_for_file_transfer (view); - nautilus_restore_files_from_trash (selection, - nautilus_files_view_get_containing_window (view)); - - nautilus_file_list_free (selection); + selection = nautilus_files_view_get_selection_for_file_transfer (view); + nautilus_restore_files_from_trash (selection, + nautilus_files_view_get_containing_window (view)); + nautilus_file_list_free (selection); } static void @@ -1476,13 +1530,13 @@ action_select_all (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; + NautilusFilesView *view; - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - nautilus_files_view_select_all (view); + nautilus_files_view_select_all (view); } static void @@ -1490,9 +1544,9 @@ action_invert_selection (GSimpleAction *action, GVariant *state, gpointer user_data) { - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - nautilus_files_view_invert_selection (user_data); + nautilus_files_view_invert_selection (user_data); } static void @@ -1500,97 +1554,105 @@ pattern_select_response_cb (GtkWidget *dialog, int response, gpointer user_data) { - NautilusFilesView *view; - NautilusDirectory *directory; - GtkWidget *entry; - GList *selection; + NautilusFilesView *view; + NautilusDirectory *directory; + GtkWidget *entry; + GList *selection; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - switch (response) { - case GTK_RESPONSE_OK : - entry = g_object_get_data (G_OBJECT (dialog), "entry"); - directory = nautilus_files_view_get_model (view); - selection = nautilus_directory_match_pattern (directory, - gtk_entry_get_text (GTK_ENTRY (entry))); + switch (response) + { + case GTK_RESPONSE_OK: + { + entry = g_object_get_data (G_OBJECT (dialog), "entry"); + directory = nautilus_files_view_get_model (view); + selection = nautilus_directory_match_pattern (directory, + gtk_entry_get_text (GTK_ENTRY (entry))); - if (selection) { - nautilus_files_view_call_set_selection (view, selection); - nautilus_file_list_free (selection); + if (selection) + { + nautilus_files_view_call_set_selection (view, selection); + nautilus_file_list_free (selection); - nautilus_files_view_reveal_selection(view); - } - /* fall through */ - case GTK_RESPONSE_NONE : - case GTK_RESPONSE_DELETE_EVENT : - case GTK_RESPONSE_CANCEL : - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; - default : - g_assert_not_reached (); + nautilus_files_view_reveal_selection (view); + } + /* fall through */ + } + + case GTK_RESPONSE_NONE: + case GTK_RESPONSE_DELETE_EVENT: + case GTK_RESPONSE_CANCEL: + { + gtk_widget_destroy (GTK_WIDGET (dialog)); } + break; + + default: + g_assert_not_reached (); + } } static void select_pattern (NautilusFilesView *view) { - GtkWidget *dialog; - GtkWidget *label; - GtkWidget *example; - GtkWidget *grid; - GtkWidget *entry; - char *example_pattern; - - dialog = gtk_dialog_new_with_buttons (_("Select Items Matching"), - nautilus_files_view_get_containing_window (view), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_USE_HEADER_BAR, - _("_Cancel"), - GTK_RESPONSE_CANCEL, - _("_Select"), - GTK_RESPONSE_OK, - NULL); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), - GTK_RESPONSE_OK); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2); - - label = gtk_label_new_with_mnemonic (_("_Pattern:")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - - example = gtk_label_new (NULL); - gtk_widget_set_halign (example, GTK_ALIGN_START); - example_pattern = g_strdup_printf ("%s<i>%s</i> ", - _("Examples: "), - "*.png, file\?\?.txt, pict*.\?\?\?"); - gtk_label_set_markup (GTK_LABEL (example), example_pattern); - g_free (example_pattern); - - entry = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); - gtk_widget_set_hexpand (entry, TRUE); - - grid = gtk_grid_new (); - g_object_set (grid, - "orientation", GTK_ORIENTATION_VERTICAL, - "border-width", 6, - "row-spacing", 6, - "column-spacing", 12, - NULL); - - gtk_container_add (GTK_CONTAINER (grid), label); - gtk_grid_attach_next_to (GTK_GRID (grid), entry, label, - GTK_POS_RIGHT, 1, 1); - gtk_grid_attach_next_to (GTK_GRID (grid), example, entry, - GTK_POS_BOTTOM, 1, 1); - - gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); - gtk_widget_show_all (grid); - gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), grid); - g_object_set_data (G_OBJECT (dialog), "entry", entry); - g_signal_connect (dialog, "response", - G_CALLBACK (pattern_select_response_cb), - view); - gtk_widget_show_all (dialog); + GtkWidget *dialog; + GtkWidget *label; + GtkWidget *example; + GtkWidget *grid; + GtkWidget *entry; + char *example_pattern; + + dialog = gtk_dialog_new_with_buttons (_("Select Items Matching"), + nautilus_files_view_get_containing_window (view), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_USE_HEADER_BAR, + _("_Cancel"), + GTK_RESPONSE_CANCEL, + _("_Select"), + GTK_RESPONSE_OK, + NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), + GTK_RESPONSE_OK); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2); + + label = gtk_label_new_with_mnemonic (_("_Pattern:")); + gtk_widget_set_halign (label, GTK_ALIGN_START); + + example = gtk_label_new (NULL); + gtk_widget_set_halign (example, GTK_ALIGN_START); + example_pattern = g_strdup_printf ("%s<i>%s</i> ", + _("Examples: "), + "*.png, file\?\?.txt, pict*.\?\?\?"); + gtk_label_set_markup (GTK_LABEL (example), example_pattern); + g_free (example_pattern); + + entry = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + gtk_widget_set_hexpand (entry, TRUE); + + grid = gtk_grid_new (); + g_object_set (grid, + "orientation", GTK_ORIENTATION_VERTICAL, + "border-width", 6, + "row-spacing", 6, + "column-spacing", 12, + NULL); + + gtk_container_add (GTK_CONTAINER (grid), label); + gtk_grid_attach_next_to (GTK_GRID (grid), entry, label, + GTK_POS_RIGHT, 1, 1); + gtk_grid_attach_next_to (GTK_GRID (grid), example, entry, + GTK_POS_BOTTOM, 1, 1); + + gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); + gtk_widget_show_all (grid); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), grid); + g_object_set_data (G_OBJECT (dialog), "entry", entry); + g_signal_connect (dialog, "response", + G_CALLBACK (pattern_select_response_cb), + view); + gtk_widget_show_all (dialog); } static void @@ -1598,21 +1660,23 @@ action_select_pattern (GSimpleAction *action, GVariant *state, gpointer user_data) { - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - select_pattern(user_data); + select_pattern (user_data); } -typedef struct { - NautilusFilesView *directory_view; - GHashTable *added_locations; - GList *selection; +typedef struct +{ + NautilusFilesView *directory_view; + GHashTable *added_locations; + GList *selection; } NewFolderData; -typedef struct { - NautilusFilesView *directory_view; - GHashTable *to_remove_locations; - NautilusFile *new_folder; +typedef struct +{ + NautilusFilesView *directory_view; + GHashTable *to_remove_locations; + NautilusFile *new_folder; } NewFolderSelectionData; static void @@ -1621,11 +1685,11 @@ track_newly_added_locations (NautilusFilesView *view, NautilusDirectory *directory, gpointer user_data) { - GHashTable *added_locations; + GHashTable *added_locations; - added_locations = user_data; + added_locations = user_data; - g_hash_table_add (added_locations, nautilus_file_get_location (new_file)); + g_hash_table_add (added_locations, nautilus_file_get_location (new_file)); } static void @@ -1633,81 +1697,89 @@ new_folder_done (GFile *new_folder, gboolean success, gpointer user_data) { - NautilusFilesView *directory_view; - NautilusFile *file; - char screen_string[32]; - GdkScreen *screen; - NewFolderData *data; + NautilusFilesView *directory_view; + NautilusFile *file; + char screen_string[32]; + GdkScreen *screen; + NewFolderData *data; - data = (NewFolderData *)user_data; + data = (NewFolderData *) user_data; - directory_view = data->directory_view; + directory_view = data->directory_view; - if (directory_view == NULL) { - goto fail; - } + if (directory_view == NULL) + { + goto fail; + } - g_signal_handlers_disconnect_by_func (directory_view, - G_CALLBACK (track_newly_added_locations), - data->added_locations); + g_signal_handlers_disconnect_by_func (directory_view, + G_CALLBACK (track_newly_added_locations), + data->added_locations); - if (new_folder == NULL) { - goto fail; - } + if (new_folder == NULL) + { + goto fail; + } - screen = gtk_widget_get_screen (GTK_WIDGET (directory_view)); - g_snprintf (screen_string, sizeof (screen_string), "%d", gdk_screen_get_number (screen)); + screen = gtk_widget_get_screen (GTK_WIDGET (directory_view)); + g_snprintf (screen_string, sizeof (screen_string), "%d", gdk_screen_get_number (screen)); - file = nautilus_file_get (new_folder); - nautilus_file_set_metadata (file, NAUTILUS_METADATA_KEY_SCREEN, - NULL, - screen_string); + file = nautilus_file_get (new_folder); + nautilus_file_set_metadata (file, NAUTILUS_METADATA_KEY_SCREEN, + NULL, + screen_string); - if (data->selection != NULL) { - GList *uris, *l; - char *target_uri; + if (data->selection != NULL) + { + GList *uris, *l; + char *target_uri; - uris = NULL; - for (l = data->selection; l != NULL; l = l->next) { - uris = g_list_prepend (uris, nautilus_file_get_uri ((NautilusFile *) l->data)); - } - uris = g_list_reverse (uris); + uris = NULL; + for (l = data->selection; l != NULL; l = l->next) + { + uris = g_list_prepend (uris, nautilus_file_get_uri ((NautilusFile *) l->data)); + } + uris = g_list_reverse (uris); - target_uri = nautilus_file_get_uri (file); + target_uri = nautilus_file_get_uri (file); - nautilus_files_view_move_copy_items (directory_view, - uris, - NULL, - target_uri, - GDK_ACTION_MOVE, - 0, 0); - g_list_free_full (uris, g_free); - g_free (target_uri); - } + nautilus_files_view_move_copy_items (directory_view, + uris, + NULL, + target_uri, + GDK_ACTION_MOVE, + 0, 0); + g_list_free_full (uris, g_free); + g_free (target_uri); + } - if (g_hash_table_contains (data->added_locations, new_folder)) { - /* The file was already added */ - nautilus_files_view_select_file (directory_view, file); - nautilus_files_view_reveal_selection (directory_view); - } else { - g_hash_table_insert (directory_view->details->pending_reveal, - file, - GUINT_TO_POINTER (TRUE)); - } + if (g_hash_table_contains (data->added_locations, new_folder)) + { + /* The file was already added */ + nautilus_files_view_select_file (directory_view, file); + nautilus_files_view_reveal_selection (directory_view); + } + else + { + g_hash_table_insert (directory_view->details->pending_reveal, + file, + GUINT_TO_POINTER (TRUE)); + } - nautilus_file_unref (file); + nautilus_file_unref (file); - fail: - g_hash_table_destroy (data->added_locations); +fail: + g_hash_table_destroy (data->added_locations); - if (data->directory_view != NULL) { - g_object_remove_weak_pointer (G_OBJECT (data->directory_view), - (gpointer *) &data->directory_view); - } + if (data->directory_view != NULL) + { + g_object_remove_weak_pointer (G_OBJECT (data->directory_view), + (gpointer *) &data->directory_view); + } - nautilus_file_list_free (data->selection); - g_free (data); + nautilus_file_list_free (data->selection); + g_free (data); } @@ -1715,196 +1787,205 @@ static NewFolderData * new_folder_data_new (NautilusFilesView *directory_view, gboolean with_selection) { - NewFolderData *data; + NewFolderData *data; - data = g_new (NewFolderData, 1); - data->directory_view = directory_view; - data->added_locations = g_hash_table_new_full (g_file_hash, (GEqualFunc)g_file_equal, - g_object_unref, NULL); - if (with_selection) { - data->selection = nautilus_files_view_get_selection_for_file_transfer (directory_view); - } else { - data->selection = NULL; - } - g_object_add_weak_pointer (G_OBJECT (data->directory_view), - (gpointer *) &data->directory_view); + data = g_new (NewFolderData, 1); + data->directory_view = directory_view; + data->added_locations = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, + g_object_unref, NULL); + if (with_selection) + { + data->selection = nautilus_files_view_get_selection_for_file_transfer (directory_view); + } + else + { + data->selection = NULL; + } + g_object_add_weak_pointer (G_OBJECT (data->directory_view), + (gpointer *) &data->directory_view); - return data; + return data; } static GdkPoint * context_menu_to_file_operation_position (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - if (nautilus_files_view_using_manual_layout (view) - && view->details->context_menu_position.x >= 0 - && view->details->context_menu_position.y >= 0) { - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->widget_to_file_operation_position - (view, &view->details->context_menu_position); - return &view->details->context_menu_position; - } else { - return NULL; - } + if (nautilus_files_view_using_manual_layout (view) + && view->details->context_menu_position.x >= 0 + && view->details->context_menu_position.y >= 0) + { + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->widget_to_file_operation_position + (view, &view->details->context_menu_position); + return &view->details->context_menu_position; + } + else + { + return NULL; + } } -static GdkRectangle* +static GdkRectangle * nautilus_files_view_compute_rename_popover_pointing_to (NautilusFilesView *view) { - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->compute_rename_popover_pointing_to (view); + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->compute_rename_popover_pointing_to (view); } static void rename_file_popover_controller_on_name_accepted (NautilusFileNameWidgetController *controller, gpointer user_data) { - NautilusFilesView *view; - NautilusFile *target_file; - g_autofree gchar *name; + NautilusFilesView *view; + NautilusFile *target_file; + g_autofree gchar *name; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - name = nautilus_file_name_widget_controller_get_new_name (controller); + name = nautilus_file_name_widget_controller_get_new_name (controller); - target_file = - nautilus_rename_file_popover_controller_get_target_file (view->details->rename_file_controller); + target_file = + nautilus_rename_file_popover_controller_get_target_file (view->details->rename_file_controller); - /* Put it on the queue for reveal after the view acknowledges the change */ - g_hash_table_insert (view->details->pending_reveal, - target_file, - GUINT_TO_POINTER (FALSE)); + /* Put it on the queue for reveal after the view acknowledges the change */ + g_hash_table_insert (view->details->pending_reveal, + target_file, + GUINT_TO_POINTER (FALSE)); - nautilus_rename_file (target_file, name, NULL, NULL); + nautilus_rename_file (target_file, name, NULL, NULL); - g_clear_object (&view->details->rename_file_controller); + g_clear_object (&view->details->rename_file_controller); } static void rename_file_popover_controller_on_cancelled (NautilusFileNameWidgetController *controller, gpointer user_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - g_clear_object (&view->details->rename_file_controller); + g_clear_object (&view->details->rename_file_controller); } static void nautilus_files_view_rename_file_popover_new (NautilusFilesView *view, NautilusFile *target_file) { - GdkRectangle *pointing_to; + GdkRectangle *pointing_to; - if (view->details->rename_file_controller != NULL) { - return; - } + if (view->details->rename_file_controller != NULL) + { + return; + } - pointing_to = nautilus_files_view_compute_rename_popover_pointing_to (view); + pointing_to = nautilus_files_view_compute_rename_popover_pointing_to (view); - view->details->rename_file_controller = - nautilus_rename_file_popover_controller_new (target_file, - pointing_to, - GTK_WIDGET (view)); + view->details->rename_file_controller = + nautilus_rename_file_popover_controller_new (target_file, + pointing_to, + GTK_WIDGET (view)); - g_signal_connect (view->details->rename_file_controller, - "name-accepted", - (GCallback)rename_file_popover_controller_on_name_accepted, - view); - g_signal_connect (view->details->rename_file_controller, - "cancelled", - (GCallback)rename_file_popover_controller_on_cancelled, - view); + g_signal_connect (view->details->rename_file_controller, + "name-accepted", + (GCallback) rename_file_popover_controller_on_name_accepted, + view); + g_signal_connect (view->details->rename_file_controller, + "cancelled", + (GCallback) rename_file_popover_controller_on_cancelled, + view); } static void new_folder_dialog_controller_on_name_accepted (NautilusFileNameWidgetController *controller, gpointer user_data) { - NautilusFilesView *view; - NewFolderData *data; - GdkPoint *position; - g_autofree gchar *parent_uri; - g_autofree gchar *name; - gboolean with_selection; + NautilusFilesView *view; + NewFolderData *data; + GdkPoint *position; + g_autofree gchar *parent_uri; + g_autofree gchar *name; + gboolean with_selection; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - with_selection = - nautilus_new_folder_dialog_controller_get_with_selection (view->details->new_folder_controller); + with_selection = + nautilus_new_folder_dialog_controller_get_with_selection (view->details->new_folder_controller); - data = new_folder_data_new (view, with_selection); + data = new_folder_data_new (view, with_selection); - name = nautilus_file_name_widget_controller_get_new_name (controller); - g_signal_connect_data (view, - "add-file", - G_CALLBACK (track_newly_added_locations), - data->added_locations, - (GClosureNotify)NULL, - G_CONNECT_AFTER); + name = nautilus_file_name_widget_controller_get_new_name (controller); + g_signal_connect_data (view, + "add-file", + G_CALLBACK (track_newly_added_locations), + data->added_locations, + (GClosureNotify) NULL, + G_CONNECT_AFTER); - position = context_menu_to_file_operation_position (view); + position = context_menu_to_file_operation_position (view); - parent_uri = nautilus_files_view_get_backing_uri (view); - nautilus_file_operations_new_folder (GTK_WIDGET (view), - position, parent_uri, name, - new_folder_done, data); + parent_uri = nautilus_files_view_get_backing_uri (view); + nautilus_file_operations_new_folder (GTK_WIDGET (view), + position, parent_uri, name, + new_folder_done, data); - g_clear_object (&view->details->new_folder_controller); + g_clear_object (&view->details->new_folder_controller); } static void new_folder_dialog_controller_on_cancelled (NautilusNewFolderDialogController *controller, gpointer user_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - g_clear_object (&view->details->new_folder_controller); + g_clear_object (&view->details->new_folder_controller); } static void nautilus_files_view_new_folder_dialog_new (NautilusFilesView *view, gboolean with_selection) { - NautilusDirectory *containing_directory; - GList *selection; - g_autofree char *uri = NULL; - g_autofree char *common_prefix = NULL; + NautilusDirectory *containing_directory; + GList *selection; + g_autofree char *uri = NULL; + g_autofree char *common_prefix = NULL; - if (view->details->new_folder_controller != NULL) { - return; - } + if (view->details->new_folder_controller != NULL) + { + return; + } - uri = nautilus_files_view_get_backing_uri (view); - containing_directory = nautilus_directory_get_by_uri (uri); + uri = nautilus_files_view_get_backing_uri (view); + containing_directory = nautilus_directory_get_by_uri (uri); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - common_prefix = nautilus_get_common_filename_prefix (selection, MIN_COMMON_FILENAME_PREFIX_LENGTH); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + common_prefix = nautilus_get_common_filename_prefix (selection, MIN_COMMON_FILENAME_PREFIX_LENGTH); - view->details->new_folder_controller = - nautilus_new_folder_dialog_controller_new (nautilus_files_view_get_containing_window (view), - containing_directory, - with_selection, - common_prefix); + view->details->new_folder_controller = + nautilus_new_folder_dialog_controller_new (nautilus_files_view_get_containing_window (view), + containing_directory, + with_selection, + common_prefix); - g_signal_connect (view->details->new_folder_controller, - "name-accepted", - (GCallback)new_folder_dialog_controller_on_name_accepted, - view); - g_signal_connect (view->details->new_folder_controller, - "cancelled", - (GCallback)new_folder_dialog_controller_on_cancelled, - view); + g_signal_connect (view->details->new_folder_controller, + "name-accepted", + (GCallback) new_folder_dialog_controller_on_name_accepted, + view); + g_signal_connect (view->details->new_folder_controller, + "cancelled", + (GCallback) new_folder_dialog_controller_on_cancelled, + view); - nautilus_file_list_free (selection); - nautilus_directory_unref (containing_directory); + nautilus_file_list_free (selection); + nautilus_directory_unref (containing_directory); } -typedef struct { - NautilusFilesView *view; - GHashTable *added_locations; +typedef struct +{ + NautilusFilesView *view; + GHashTable *added_locations; } CompressData; static void @@ -1912,200 +1993,220 @@ compress_done (GFile *new_file, gboolean success, gpointer user_data) { - CompressData *data; - NautilusFilesView *view; - NautilusFile *file; + CompressData *data; + NautilusFilesView *view; + NautilusFile *file; - data = user_data; - view = data->view; + data = user_data; + view = data->view; - if (view == NULL) { - goto out; - } + if (view == NULL) + { + goto out; + } - g_signal_handlers_disconnect_by_func (view, - G_CALLBACK (track_newly_added_locations), - data->added_locations); + g_signal_handlers_disconnect_by_func (view, + G_CALLBACK (track_newly_added_locations), + data->added_locations); - if (!success) { - goto out; - } + if (!success) + { + goto out; + } - file = nautilus_file_get (new_file); + file = nautilus_file_get (new_file); - if (g_hash_table_contains (data->added_locations, new_file)) { - /* The file was already added */ - nautilus_files_view_select_file (view, file); - nautilus_files_view_reveal_selection (view); - } else { - g_hash_table_insert (view->details->pending_reveal, - file, - GUINT_TO_POINTER (TRUE)); - } + if (g_hash_table_contains (data->added_locations, new_file)) + { + /* The file was already added */ + nautilus_files_view_select_file (view, file); + nautilus_files_view_reveal_selection (view); + } + else + { + g_hash_table_insert (view->details->pending_reveal, + file, + GUINT_TO_POINTER (TRUE)); + } - nautilus_file_unref (file); - out: - g_hash_table_destroy (data->added_locations); + nautilus_file_unref (file); +out: + g_hash_table_destroy (data->added_locations); - if (data->view != NULL) { - g_object_remove_weak_pointer (G_OBJECT (data->view), - (gpointer *) &data->view); - } + if (data->view != NULL) + { + g_object_remove_weak_pointer (G_OBJECT (data->view), + (gpointer *) &data->view); + } - g_free (data); + g_free (data); } static void compress_dialog_controller_on_name_accepted (NautilusFileNameWidgetController *controller, gpointer user_data) { - NautilusFilesView *view; - g_autofree gchar *name; - GList *selection; - GList *source_files = NULL; - GList *l; - CompressData *data; - g_autoptr (GFile) output; - NautilusCompressionFormat compression_format; - AutoarFormat format; - AutoarFilter filter; - - view = NAUTILUS_FILES_VIEW (user_data); - - selection = nautilus_files_view_get_selection_for_file_transfer (view); - - for (l = selection; l != NULL; l = l->next) { - source_files = g_list_prepend (source_files, - nautilus_file_get_location (l->data)); + NautilusFilesView *view; + g_autofree gchar *name; + GList *selection; + GList *source_files = NULL; + GList *l; + CompressData *data; + g_autoptr (GFile) output; + NautilusCompressionFormat compression_format; + AutoarFormat format; + AutoarFilter filter; + + view = NAUTILUS_FILES_VIEW (user_data); + + selection = nautilus_files_view_get_selection_for_file_transfer (view); + + for (l = selection; l != NULL; l = l->next) + { + source_files = g_list_prepend (source_files, + nautilus_file_get_location (l->data)); + } + source_files = g_list_reverse (source_files); + + name = nautilus_file_name_widget_controller_get_new_name (controller); + output = g_file_get_child (view->details->location, name); + + data = g_new (CompressData, 1); + data->view = view; + data->added_locations = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, + g_object_unref, NULL); + g_object_add_weak_pointer (G_OBJECT (data->view), + (gpointer *) &data->view); + + g_signal_connect_data (view, + "add-file", + G_CALLBACK (track_newly_added_locations), + data->added_locations, + NULL, + G_CONNECT_AFTER); + + compression_format = g_settings_get_enum (nautilus_compression_preferences, + NAUTILUS_PREFERENCES_DEFAULT_COMPRESSION_FORMAT); + + switch (compression_format) + { + case NAUTILUS_COMPRESSION_ZIP: + { + format = AUTOAR_FORMAT_ZIP; + filter = AUTOAR_FILTER_NONE; } - source_files = g_list_reverse (source_files); - - name = nautilus_file_name_widget_controller_get_new_name (controller); - output = g_file_get_child (view->details->location, name); - - data = g_new (CompressData, 1); - data->view = view; - data->added_locations = g_hash_table_new_full (g_file_hash, (GEqualFunc)g_file_equal, - g_object_unref, NULL); - g_object_add_weak_pointer (G_OBJECT (data->view), - (gpointer *) &data->view); + break; - g_signal_connect_data (view, - "add-file", - G_CALLBACK (track_newly_added_locations), - data->added_locations, - NULL, - G_CONNECT_AFTER); + case NAUTILUS_COMPRESSION_TAR_XZ: + { + format = AUTOAR_FORMAT_TAR; + filter = AUTOAR_FILTER_XZ; + } + break; - compression_format = g_settings_get_enum (nautilus_compression_preferences, - NAUTILUS_PREFERENCES_DEFAULT_COMPRESSION_FORMAT); - - switch (compression_format) { - case NAUTILUS_COMPRESSION_ZIP: - format = AUTOAR_FORMAT_ZIP; - filter = AUTOAR_FILTER_NONE; - break; - case NAUTILUS_COMPRESSION_TAR_XZ: - format = AUTOAR_FORMAT_TAR; - filter = AUTOAR_FILTER_XZ; - break; - case NAUTILUS_COMPRESSION_7ZIP: - format = AUTOAR_FORMAT_7ZIP; - filter = AUTOAR_FILTER_NONE; - break; - default: - g_assert_not_reached (); + case NAUTILUS_COMPRESSION_7ZIP: + { + format = AUTOAR_FORMAT_7ZIP; + filter = AUTOAR_FILTER_NONE; } + break; + + default: + g_assert_not_reached (); + } - nautilus_file_operations_compress (source_files, output, - format, - filter, - nautilus_files_view_get_containing_window (view), - compress_done, - data); + nautilus_file_operations_compress (source_files, output, + format, + filter, + nautilus_files_view_get_containing_window (view), + compress_done, + data); - nautilus_file_list_free (selection); - g_list_free_full (source_files, g_object_unref); - g_clear_object (&view->details->compress_controller); + nautilus_file_list_free (selection); + g_list_free_full (source_files, g_object_unref); + g_clear_object (&view->details->compress_controller); } static void compress_dialog_controller_on_cancelled (NautilusNewFolderDialogController *controller, gpointer user_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - g_clear_object (&view->details->compress_controller); + g_clear_object (&view->details->compress_controller); } static void nautilus_files_view_compress_dialog_new (NautilusFilesView *view) { + NautilusDirectory *containing_directory; + GList *selection; + g_autofree char *common_prefix = NULL; - NautilusDirectory *containing_directory; - GList *selection; - g_autofree char *common_prefix = NULL; + if (view->details->compress_controller != NULL) + { + return; + } - if (view->details->compress_controller != NULL) { - return; - } + containing_directory = nautilus_directory_get_by_uri (nautilus_files_view_get_backing_uri (view)); - containing_directory = nautilus_directory_get_by_uri (nautilus_files_view_get_backing_uri (view)); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + if (g_list_length (selection) == 1) + { + g_autofree char *display_name; - if (g_list_length (selection) == 1) { - g_autofree char *display_name; + display_name = nautilus_file_get_display_name (selection->data); - display_name = nautilus_file_get_display_name (selection->data); + common_prefix = eel_filename_strip_extension (display_name); + } + else + { + common_prefix = nautilus_get_common_filename_prefix (selection, + MIN_COMMON_FILENAME_PREFIX_LENGTH); + } - common_prefix = eel_filename_strip_extension (display_name); - } else { - common_prefix = nautilus_get_common_filename_prefix (selection, - MIN_COMMON_FILENAME_PREFIX_LENGTH); - } + view->details->compress_controller = nautilus_compress_dialog_controller_new (nautilus_files_view_get_containing_window (view), + containing_directory, + common_prefix); - view->details->compress_controller = nautilus_compress_dialog_controller_new (nautilus_files_view_get_containing_window (view), - containing_directory, - common_prefix); + g_signal_connect (view->details->compress_controller, + "name-accepted", + (GCallback) compress_dialog_controller_on_name_accepted, + view); + g_signal_connect (view->details->compress_controller, + "cancelled", + (GCallback) compress_dialog_controller_on_cancelled, + view); - g_signal_connect (view->details->compress_controller, - "name-accepted", - (GCallback)compress_dialog_controller_on_name_accepted, - view); - g_signal_connect (view->details->compress_controller, - "cancelled", - (GCallback)compress_dialog_controller_on_cancelled, - view); - - nautilus_file_list_free (selection); + nautilus_file_list_free (selection); } static void nautilus_files_view_new_folder (NautilusFilesView *directory_view, gboolean with_selection) { - nautilus_files_view_new_folder_dialog_new (directory_view, with_selection); + nautilus_files_view_new_folder_dialog_new (directory_view, with_selection); } static NewFolderData * setup_new_folder_data (NautilusFilesView *directory_view) { - NewFolderData *data; + NewFolderData *data; - data = new_folder_data_new (directory_view, FALSE); + data = new_folder_data_new (directory_view, FALSE); - g_signal_connect_data (directory_view, - "add-file", - G_CALLBACK (track_newly_added_locations), - data->added_locations, - (GClosureNotify)NULL, - G_CONNECT_AFTER); + g_signal_connect_data (directory_view, + "add-file", + G_CALLBACK (track_newly_added_locations), + data->added_locations, + (GClosureNotify) NULL, + G_CONNECT_AFTER); - return data; + return data; } void @@ -2116,20 +2217,21 @@ nautilus_files_view_new_file_with_initial_contents (NautilusFilesView *view, int length, GdkPoint *pos) { - NewFolderData *data; + NewFolderData *data; - g_assert (parent_uri != NULL); + g_assert (parent_uri != NULL); - data = setup_new_folder_data (view); + data = setup_new_folder_data (view); - if (pos == NULL) { - pos = context_menu_to_file_operation_position (view); - } + if (pos == NULL) + { + pos = context_menu_to_file_operation_position (view); + } - nautilus_file_operations_new_file (GTK_WIDGET (view), - pos, parent_uri, filename, - initial_contents, length, - new_folder_done, data); + nautilus_file_operations_new_file (GTK_WIDGET (view), + pos, parent_uri, filename, + initial_contents, length, + new_folder_done, data); } static void @@ -2137,45 +2239,47 @@ nautilus_files_view_new_file (NautilusFilesView *directory_view, const char *parent_uri, NautilusFile *source) { - GdkPoint *pos; - NewFolderData *data; - char *source_uri; - char *container_uri; - - container_uri = NULL; - if (parent_uri == NULL) { - container_uri = nautilus_files_view_get_backing_uri (directory_view); - g_assert (container_uri != NULL); - } - - if (source == NULL) { - nautilus_files_view_new_file_with_initial_contents (directory_view, - parent_uri != NULL ? parent_uri : container_uri, - NULL, - NULL, - 0, - NULL); - g_free (container_uri); - return; - } + GdkPoint *pos; + NewFolderData *data; + char *source_uri; + char *container_uri; + + container_uri = NULL; + if (parent_uri == NULL) + { + container_uri = nautilus_files_view_get_backing_uri (directory_view); + g_assert (container_uri != NULL); + } + + if (source == NULL) + { + nautilus_files_view_new_file_with_initial_contents (directory_view, + parent_uri != NULL ? parent_uri : container_uri, + NULL, + NULL, + 0, + NULL); + g_free (container_uri); + return; + } - g_return_if_fail (nautilus_file_is_local (source)); + g_return_if_fail (nautilus_file_is_local (source)); - pos = context_menu_to_file_operation_position (directory_view); + pos = context_menu_to_file_operation_position (directory_view); - data = setup_new_folder_data (directory_view); + data = setup_new_folder_data (directory_view); - source_uri = nautilus_file_get_uri (source); + source_uri = nautilus_file_get_uri (source); - nautilus_file_operations_new_file_from_template (GTK_WIDGET (directory_view), - pos, - parent_uri != NULL ? parent_uri : container_uri, - NULL, - source_uri, - new_folder_done, data); + nautilus_file_operations_new_file_from_template (GTK_WIDGET (directory_view), + pos, + parent_uri != NULL ? parent_uri : container_uri, + NULL, + source_uri, + new_folder_done, data); - g_free (source_uri); - g_free (container_uri); + g_free (source_uri); + g_free (container_uri); } static void @@ -2183,14 +2287,14 @@ action_new_folder (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusWindow *window; + NautilusWindow *window; - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - window = nautilus_files_view_get_window (NAUTILUS_FILES_VIEW (user_data)); - nautilus_window_hide_view_menu (window); + window = nautilus_files_view_get_window (NAUTILUS_FILES_VIEW (user_data)); + nautilus_window_hide_view_menu (window); - nautilus_files_view_new_folder (NAUTILUS_FILES_VIEW (user_data), FALSE); + nautilus_files_view_new_folder (NAUTILUS_FILES_VIEW (user_data), FALSE); } static void @@ -2198,9 +2302,9 @@ action_new_folder_with_selection (GSimpleAction *action, GVariant *state, gpointer user_data) { - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - nautilus_files_view_new_folder (NAUTILUS_FILES_VIEW (user_data), TRUE); + nautilus_files_view_new_folder (NAUTILUS_FILES_VIEW (user_data), TRUE); } static void @@ -2208,47 +2312,54 @@ action_properties (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GList *selection; - GList *files; + NautilusFilesView *view; + GList *selection; + GList *files; - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - if (g_list_length (selection) == 0) { - if (view->details->directory_as_file != NULL) { - files = g_list_append (NULL, nautilus_file_ref (view->details->directory_as_file)); + view = NAUTILUS_FILES_VIEW (user_data); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + if (g_list_length (selection) == 0) + { + if (view->details->directory_as_file != NULL) + { + files = g_list_append (NULL, nautilus_file_ref (view->details->directory_as_file)); - nautilus_properties_window_present (files, GTK_WIDGET (view), NULL); + nautilus_properties_window_present (files, GTK_WIDGET (view), NULL); - nautilus_file_list_free (files); - } - } else { - nautilus_properties_window_present (selection, GTK_WIDGET (view), NULL); + nautilus_file_list_free (files); } - nautilus_file_list_free (selection); + } + else + { + nautilus_properties_window_present (selection, GTK_WIDGET (view), NULL); + } + nautilus_file_list_free (selection); } static void nautilus_files_view_set_show_hidden_files (NautilusFilesView *view, gboolean show_hidden) { - if (view->details->ignore_hidden_file_preferences) { - return; - } + if (view->details->ignore_hidden_file_preferences) + { + return; + } - if (show_hidden != view->details->show_hidden_files) { - view->details->show_hidden_files = show_hidden; + if (show_hidden != view->details->show_hidden_files) + { + view->details->show_hidden_files = show_hidden; - g_settings_set_boolean (gtk_filechooser_preferences, - NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, - show_hidden); + g_settings_set_boolean (gtk_filechooser_preferences, + NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, + show_hidden); - if (view->details->model != NULL) { - load_directory (view, view->details->model); - } + if (view->details->model != NULL) + { + load_directory (view, view->details->model); } + } } static void @@ -2256,17 +2367,17 @@ action_show_hidden_files (GSimpleAction *action, GVariant *state, gpointer user_data) { - gboolean show_hidden; - NautilusFilesView *view; + gboolean show_hidden; + NautilusFilesView *view; - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - view = NAUTILUS_FILES_VIEW (user_data); - show_hidden = g_variant_get_boolean (state); + view = NAUTILUS_FILES_VIEW (user_data); + show_hidden = g_variant_get_boolean (state); - nautilus_files_view_set_show_hidden_files (view, show_hidden); + nautilus_files_view_set_show_hidden_files (view, show_hidden); - g_simple_action_set_state (action, state); + g_simple_action_set_state (action, state); } static void @@ -2274,13 +2385,13 @@ action_zoom_in (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; + NautilusFilesView *view; - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - nautilus_files_view_bump_zoom_level (view, 1); + nautilus_files_view_bump_zoom_level (view, 1); } static void @@ -2288,13 +2399,13 @@ action_zoom_out (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; + NautilusFilesView *view; - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - nautilus_files_view_bump_zoom_level (view, -1); + nautilus_files_view_bump_zoom_level (view, -1); } static void @@ -2302,7 +2413,7 @@ action_zoom_standard (GSimpleAction *action, GVariant *state, gpointer user_data) { - nautilus_files_view_restore_standard_zoom_level (user_data); + nautilus_files_view_restore_standard_zoom_level (user_data); } static void @@ -2310,19 +2421,20 @@ action_open_item_new_window (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GtkWindow *window; - GList *selection; + NautilusFilesView *view; + GtkWindow *window; + GList *selection; - view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - window = GTK_WINDOW (nautilus_files_view_get_containing_window (view)); + view = NAUTILUS_FILES_VIEW (user_data); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + window = GTK_WINDOW (nautilus_files_view_get_containing_window (view)); - if (nautilus_files_view_confirm_multiple (window, g_list_length (selection), TRUE)) { - g_list_foreach (selection, open_one_in_new_window, view); - } + if (nautilus_files_view_confirm_multiple (window, g_list_length (selection), TRUE)) + { + g_list_foreach (selection, open_one_in_new_window, view); + } - nautilus_file_list_free (selection); + nautilus_file_list_free (selection); } static void @@ -2331,23 +2443,25 @@ handle_clipboard_data (NautilusFilesView *view, char *destination_uri, GdkDragAction action) { - GList *item_uris; + GList *item_uris; - item_uris = nautilus_clipboard_get_uri_list_from_selection_data (selection_data, NULL, - copied_files_atom); + item_uris = nautilus_clipboard_get_uri_list_from_selection_data (selection_data, NULL, + copied_files_atom); - if (item_uris != NULL && destination_uri != NULL) { - nautilus_files_view_move_copy_items (view, item_uris, NULL, destination_uri, - action, - 0, 0); - - /* If items are cut then remove from clipboard */ - if (action == GDK_ACTION_MOVE) { - gtk_clipboard_clear (nautilus_clipboard_get (GTK_WIDGET (view))); - } + if (item_uris != NULL && destination_uri != NULL) + { + nautilus_files_view_move_copy_items (view, item_uris, NULL, destination_uri, + action, + 0, 0); - g_list_free_full (item_uris, g_free); + /* If items are cut then remove from clipboard */ + if (action == GDK_ACTION_MOVE) + { + gtk_clipboard_clear (nautilus_clipboard_get (GTK_WIDGET (view))); } + + g_list_free_full (item_uris, g_free); + } } static void @@ -2355,12 +2469,12 @@ paste_clipboard_data (NautilusFilesView *view, GtkSelectionData *selection_data, char *destination_uri) { - GdkDragAction action; + GdkDragAction action; - action = nautilus_clipboard_monitor_is_cut (nautilus_clipboard_monitor_get ()) ? - GDK_ACTION_MOVE : GDK_ACTION_COPY; + action = nautilus_clipboard_monitor_is_cut (nautilus_clipboard_monitor_get ()) ? + GDK_ACTION_MOVE : GDK_ACTION_COPY; - handle_clipboard_data (view, selection_data, destination_uri, action); + handle_clipboard_data (view, selection_data, destination_uri, action); } static void @@ -2368,20 +2482,21 @@ paste_clipboard_received_callback (GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data) { - NautilusFilesView *view; - char *view_uri; + NautilusFilesView *view; + char *view_uri; - view = NAUTILUS_FILES_VIEW (data); + view = NAUTILUS_FILES_VIEW (data); - view_uri = nautilus_files_view_get_backing_uri (view); + view_uri = nautilus_files_view_get_backing_uri (view); - if (view->details->slot != NULL) { - paste_clipboard_data (view, selection_data, view_uri); - } + if (view->details->slot != NULL) + { + paste_clipboard_data (view, selection_data, view_uri); + } - g_free (view_uri); + g_free (view_uri); - g_object_unref (view); + g_object_unref (view); } static void @@ -2389,17 +2504,17 @@ action_paste_files (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; + NautilusFilesView *view; - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - g_object_ref (view); - gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)), - copied_files_atom, - paste_clipboard_received_callback, - view); + g_object_ref (view); + gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)), + copied_files_atom, + paste_clipboard_received_callback, + view); } static void @@ -2407,20 +2522,21 @@ create_links_clipboard_received_callback (GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data) { - NautilusFilesView *view; - char *view_uri; + NautilusFilesView *view; + char *view_uri; - view = NAUTILUS_FILES_VIEW (data); + view = NAUTILUS_FILES_VIEW (data); - view_uri = nautilus_files_view_get_backing_uri (view); + view_uri = nautilus_files_view_get_backing_uri (view); - if (view->details->slot != NULL) { - handle_clipboard_data (view, selection_data, view_uri, GDK_ACTION_LINK); - } + if (view->details->slot != NULL) + { + handle_clipboard_data (view, selection_data, view_uri, GDK_ACTION_LINK); + } - g_free (view_uri); + g_free (view_uri); - g_object_unref (view); + g_object_unref (view); } static void @@ -2428,163 +2544,173 @@ action_create_links (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; + NautilusFilesView *view; - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - g_object_ref (view); - gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)), - copied_files_atom, - create_links_clipboard_received_callback, - view); + g_object_ref (view); + gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)), + copied_files_atom, + create_links_clipboard_received_callback, + view); } static void click_policy_changed_callback (gpointer callback_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (callback_data); + view = NAUTILUS_FILES_VIEW (callback_data); - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->click_policy_changed (view); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->click_policy_changed (view); } gboolean nautilus_files_view_should_sort_directories_first (NautilusFilesView *view) { - return view->details->sort_directories_first; + return view->details->sort_directories_first; } static void sort_directories_first_changed_callback (gpointer callback_data) { - NautilusFilesView *view; - gboolean preference_value; + NautilusFilesView *view; + gboolean preference_value; - view = NAUTILUS_FILES_VIEW (callback_data); + view = NAUTILUS_FILES_VIEW (callback_data); - preference_value = - g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); + preference_value = + g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); - if (preference_value != view->details->sort_directories_first) { - view->details->sort_directories_first = preference_value; - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->sort_directories_first_changed (view); - } + if (preference_value != view->details->sort_directories_first) + { + view->details->sort_directories_first = preference_value; + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->sort_directories_first_changed (view); + } } static void show_hidden_files_changed_callback (gpointer callback_data) { - NautilusFilesView *view; - gboolean preference_value; + NautilusFilesView *view; + gboolean preference_value; - view = NAUTILUS_FILES_VIEW (callback_data); + view = NAUTILUS_FILES_VIEW (callback_data); - preference_value = - g_settings_get_boolean (gtk_filechooser_preferences, NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); + preference_value = + g_settings_get_boolean (gtk_filechooser_preferences, NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); - nautilus_files_view_set_show_hidden_files (view, preference_value); + nautilus_files_view_set_show_hidden_files (view, preference_value); } static gboolean set_up_scripts_directory_global (void) { - g_autofree gchar *old_scripts_directory_path = NULL; - g_autoptr (GFile) old_scripts_directory = NULL; - g_autofree gchar *scripts_directory_path = NULL; - g_autoptr (GFile) scripts_directory = NULL; - const char *override; - GFileType file_type; - g_autoptr (GError) error = NULL; - - if (scripts_directory_uri != NULL) { - return TRUE; - } - - scripts_directory_path = nautilus_get_scripts_directory_path (); - - override = g_getenv ("GNOME22_USER_DIR"); - - if (override) { - old_scripts_directory_path = g_build_filename (override, - "nautilus-scripts", - NULL); - } else { - old_scripts_directory_path = g_build_filename (g_get_home_dir (), - ".gnome2", - "nautilus-scripts", - NULL); - } - - old_scripts_directory = g_file_new_for_path (old_scripts_directory_path); - scripts_directory = g_file_new_for_path (scripts_directory_path); + g_autofree gchar *old_scripts_directory_path = NULL; + g_autoptr (GFile) old_scripts_directory = NULL; + g_autofree gchar *scripts_directory_path = NULL; + g_autoptr (GFile) scripts_directory = NULL; + const char *override; + GFileType file_type; + g_autoptr (GError) error = NULL; - file_type = g_file_query_file_type (old_scripts_directory, - G_FILE_QUERY_INFO_NONE, - NULL); - - if (file_type == G_FILE_TYPE_DIRECTORY && - !g_file_query_exists (scripts_directory, NULL)) { - g_autoptr (GFile) updated; - const char *message; - - /* test if we already attempted to migrate first */ - updated = g_file_get_child (old_scripts_directory, "DEPRECATED-DIRECTORY"); - message = _("Nautilus 3.6 deprecated this directory and tried migrating " - "this configuration to ~/.local/share/nautilus"); - if (!g_file_query_exists (updated, NULL)) { - g_autoptr (GFile) parent = g_file_get_parent (scripts_directory); - g_autoptr (GError) error = NULL; - - g_file_make_directory_with_parents (parent, NULL, &error); - - if (error == NULL || - g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) { - g_clear_error (&error); - - g_file_set_attribute_uint32 (parent, - G_FILE_ATTRIBUTE_UNIX_MODE, - S_IRWXU, - G_FILE_QUERY_INFO_NONE, - NULL, NULL); - - g_file_move (old_scripts_directory, - scripts_directory, - G_FILE_COPY_NONE, - NULL, NULL, NULL, - &error); - - if (error == NULL) { - g_file_replace_contents (updated, - message, strlen (message), - NULL, - FALSE, - G_FILE_CREATE_PRIVATE, - NULL, NULL, NULL); - } - } - - g_clear_error (&error); - } - } - - g_file_make_directory_with_parents (scripts_directory, NULL, &error); + if (scripts_directory_uri != NULL) + { + return TRUE; + } + + scripts_directory_path = nautilus_get_scripts_directory_path (); + + override = g_getenv ("GNOME22_USER_DIR"); + + if (override) + { + old_scripts_directory_path = g_build_filename (override, + "nautilus-scripts", + NULL); + } + else + { + old_scripts_directory_path = g_build_filename (g_get_home_dir (), + ".gnome2", + "nautilus-scripts", + NULL); + } + + old_scripts_directory = g_file_new_for_path (old_scripts_directory_path); + scripts_directory = g_file_new_for_path (scripts_directory_path); + + file_type = g_file_query_file_type (old_scripts_directory, + G_FILE_QUERY_INFO_NONE, + NULL); - if (error == NULL || - g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) { - g_file_set_attribute_uint32 (scripts_directory, + if (file_type == G_FILE_TYPE_DIRECTORY && + !g_file_query_exists (scripts_directory, NULL)) + { + g_autoptr (GFile) updated; + const char *message; + + /* test if we already attempted to migrate first */ + updated = g_file_get_child (old_scripts_directory, "DEPRECATED-DIRECTORY"); + message = _("Nautilus 3.6 deprecated this directory and tried migrating " + "this configuration to ~/.local/share/nautilus"); + if (!g_file_query_exists (updated, NULL)) + { + g_autoptr (GFile) parent = g_file_get_parent (scripts_directory); + g_autoptr (GError) error = NULL; + + g_file_make_directory_with_parents (parent, NULL, &error); + + if (error == NULL || + g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) + { + g_clear_error (&error); + + g_file_set_attribute_uint32 (parent, G_FILE_ATTRIBUTE_UNIX_MODE, S_IRWXU, G_FILE_QUERY_INFO_NONE, NULL, NULL); - scripts_directory_uri = g_file_get_uri (scripts_directory); - scripts_directory_uri_length = strlen (scripts_directory_uri); + g_file_move (old_scripts_directory, + scripts_directory, + G_FILE_COPY_NONE, + NULL, NULL, NULL, + &error); + + if (error == NULL) + { + g_file_replace_contents (updated, + message, strlen (message), + NULL, + FALSE, + G_FILE_CREATE_PRIVATE, + NULL, NULL, NULL); + } + } + + g_clear_error (&error); } + } + + g_file_make_directory_with_parents (scripts_directory, NULL, &error); + + if (error == NULL || + g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) + { + g_file_set_attribute_uint32 (scripts_directory, + G_FILE_ATTRIBUTE_UNIX_MODE, + S_IRWXU, + G_FILE_QUERY_INFO_NONE, + NULL, NULL); - return scripts_directory_uri != NULL; + scripts_directory_uri = g_file_get_uri (scripts_directory); + scripts_directory_uri_length = strlen (scripts_directory_uri); + } + + return scripts_directory_uri != NULL; } static void @@ -2592,13 +2718,14 @@ scripts_added_or_changed_callback (NautilusDirectory *directory, GList *files, gpointer callback_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (callback_data); + view = NAUTILUS_FILES_VIEW (callback_data); - if (view->details->active) { - schedule_update_context_menus (view); - } + if (view->details->active) + { + schedule_update_context_menus (view); + } } static void @@ -2606,13 +2733,14 @@ templates_added_or_changed_callback (NautilusDirectory *directory, GList *files, gpointer callback_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (callback_data); + view = NAUTILUS_FILES_VIEW (callback_data); - if (view->details->active) { - schedule_update_context_menus (view); - } + if (view->details->active) + { + schedule_update_context_menus (view); + } } static void @@ -2621,27 +2749,28 @@ add_directory_to_directory_list (NautilusFilesView *view, GList **directory_list, GCallback changed_callback) { - NautilusFileAttributes attributes; + NautilusFileAttributes attributes; - if (g_list_find (*directory_list, directory) == NULL) { - nautilus_directory_ref (directory); + if (g_list_find (*directory_list, directory) == NULL) + { + nautilus_directory_ref (directory); - attributes = - NAUTILUS_FILE_ATTRIBUTES_FOR_ICON | - NAUTILUS_FILE_ATTRIBUTE_INFO | - NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT; + attributes = + NAUTILUS_FILE_ATTRIBUTES_FOR_ICON | + NAUTILUS_FILE_ATTRIBUTE_INFO | + NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT; - nautilus_directory_file_monitor_add (directory, directory_list, - FALSE, attributes, - (NautilusDirectoryCallback)changed_callback, view); + nautilus_directory_file_monitor_add (directory, directory_list, + FALSE, attributes, + (NautilusDirectoryCallback) changed_callback, view); - g_signal_connect_object (directory, "files-added", - G_CALLBACK (changed_callback), view, 0); - g_signal_connect_object (directory, "files-changed", - G_CALLBACK (changed_callback), view, 0); + g_signal_connect_object (directory, "files-added", + G_CALLBACK (changed_callback), view, 0); + g_signal_connect_object (directory, "files-changed", + G_CALLBACK (changed_callback), view, 0); - *directory_list = g_list_append (*directory_list, directory); - } + *directory_list = g_list_append (*directory_list, directory); + } } static void @@ -2650,15 +2779,15 @@ remove_directory_from_directory_list (NautilusFilesView *view, GList **directory_list, GCallback changed_callback) { - *directory_list = g_list_remove (*directory_list, directory); + *directory_list = g_list_remove (*directory_list, directory); - g_signal_handlers_disconnect_by_func (directory, - G_CALLBACK (changed_callback), - view); + g_signal_handlers_disconnect_by_func (directory, + G_CALLBACK (changed_callback), + view); - nautilus_directory_file_monitor_remove (directory, directory_list); + nautilus_directory_file_monitor_remove (directory, directory_list); - nautilus_directory_unref (directory); + nautilus_directory_unref (directory); } @@ -2666,243 +2795,257 @@ static void add_directory_to_scripts_directory_list (NautilusFilesView *view, NautilusDirectory *directory) { - add_directory_to_directory_list (view, directory, - &view->details->scripts_directory_list, - G_CALLBACK (scripts_added_or_changed_callback)); + add_directory_to_directory_list (view, directory, + &view->details->scripts_directory_list, + G_CALLBACK (scripts_added_or_changed_callback)); } static void remove_directory_from_scripts_directory_list (NautilusFilesView *view, NautilusDirectory *directory) { - remove_directory_from_directory_list (view, directory, - &view->details->scripts_directory_list, - G_CALLBACK (scripts_added_or_changed_callback)); + remove_directory_from_directory_list (view, directory, + &view->details->scripts_directory_list, + G_CALLBACK (scripts_added_or_changed_callback)); } static void add_directory_to_templates_directory_list (NautilusFilesView *view, NautilusDirectory *directory) { - add_directory_to_directory_list (view, directory, - &view->details->templates_directory_list, - G_CALLBACK (templates_added_or_changed_callback)); + add_directory_to_directory_list (view, directory, + &view->details->templates_directory_list, + G_CALLBACK (templates_added_or_changed_callback)); } static void remove_directory_from_templates_directory_list (NautilusFilesView *view, NautilusDirectory *directory) { - remove_directory_from_directory_list (view, directory, - &view->details->templates_directory_list, - G_CALLBACK (templates_added_or_changed_callback)); + remove_directory_from_directory_list (view, directory, + &view->details->templates_directory_list, + G_CALLBACK (templates_added_or_changed_callback)); } static void slot_active (NautilusWindowSlot *slot, NautilusFilesView *view) { - if (view->details->active) { - return; - } + if (view->details->active) + { + return; + } - view->details->active = TRUE; + view->details->active = TRUE; - /* Avoid updating the toolbar withouth making sure the toolbar - * zoom slider has the correct adjustment that changes when the - * view mode changes - */ - nautilus_files_view_update_context_menus(view); - nautilus_files_view_update_toolbar_menus (view); + /* Avoid updating the toolbar withouth making sure the toolbar + * zoom slider has the correct adjustment that changes when the + * view mode changes + */ + nautilus_files_view_update_context_menus (view); + nautilus_files_view_update_toolbar_menus (view); - schedule_update_context_menus (view); + schedule_update_context_menus (view); - gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), - "view", - G_ACTION_GROUP (view->details->view_action_group)); + gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), + "view", + G_ACTION_GROUP (view->details->view_action_group)); } static void slot_inactive (NautilusWindowSlot *slot, NautilusFilesView *view) { - if (!view->details->active) { - return; - } + if (!view->details->active) + { + return; + } - view->details->active = FALSE; + view->details->active = FALSE; - remove_update_context_menus_timeout_callback (view); - gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), - "view", - NULL); + remove_update_context_menus_timeout_callback (view); + gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), + "view", + NULL); } static void nautilus_files_view_grab_focus (GtkWidget *widget) { - /* focus the child of the scrolled window if it exists */ - NautilusFilesView *view; - GtkWidget *child; + /* focus the child of the scrolled window if it exists */ + NautilusFilesView *view; + GtkWidget *child; - view = NAUTILUS_FILES_VIEW (widget); - child = gtk_bin_get_child (GTK_BIN (view->details->scrolled_window)); + view = NAUTILUS_FILES_VIEW (widget); + child = gtk_bin_get_child (GTK_BIN (view->details->scrolled_window)); - GTK_WIDGET_CLASS (nautilus_files_view_parent_class)->grab_focus (widget); + GTK_WIDGET_CLASS (nautilus_files_view_parent_class)->grab_focus (widget); - if (child) { - gtk_widget_grab_focus (GTK_WIDGET (child)); - } + if (child) + { + gtk_widget_grab_focus (GTK_WIDGET (child)); + } } static void nautilus_files_view_set_selection (NautilusView *nautilus_files_view, GList *selection) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (nautilus_files_view); + view = NAUTILUS_FILES_VIEW (nautilus_files_view); - if (!view->details->loading) { - /* If we aren't still loading, set the selection right now, - * and reveal the new selection. - */ - nautilus_files_view_call_set_selection (view, selection); - nautilus_files_view_reveal_selection (view); - } else { - /* If we are still loading, set the list of pending URIs instead. - * done_loading() will eventually select the pending URIs and reveal them. - */ - g_list_free_full (view->details->pending_selection, g_object_unref); - view->details->pending_selection = - g_list_copy_deep (selection, (GCopyFunc) g_object_ref, NULL); - } + if (!view->details->loading) + { + /* If we aren't still loading, set the selection right now, + * and reveal the new selection. + */ + nautilus_files_view_call_set_selection (view, selection); + nautilus_files_view_reveal_selection (view); + } + else + { + /* If we are still loading, set the list of pending URIs instead. + * done_loading() will eventually select the pending URIs and reveal them. + */ + g_list_free_full (view->details->pending_selection, g_object_unref); + view->details->pending_selection = + g_list_copy_deep (selection, (GCopyFunc) g_object_ref, NULL); + } } static char * get_bulk_rename_tool () { - char *bulk_rename_tool; - g_settings_get (nautilus_preferences, NAUTILUS_PREFERENCES_BULK_RENAME_TOOL, "^ay", &bulk_rename_tool); - return g_strstrip (bulk_rename_tool); + char *bulk_rename_tool; + g_settings_get (nautilus_preferences, NAUTILUS_PREFERENCES_BULK_RENAME_TOOL, "^ay", &bulk_rename_tool); + return g_strstrip (bulk_rename_tool); } static gboolean have_bulk_rename_tool () { - char *bulk_rename_tool; - gboolean have_tool; + char *bulk_rename_tool; + gboolean have_tool; - bulk_rename_tool = get_bulk_rename_tool (); - have_tool = ((bulk_rename_tool != NULL) && (*bulk_rename_tool != '\0')); - g_free (bulk_rename_tool); - return have_tool; + bulk_rename_tool = get_bulk_rename_tool (); + have_tool = ((bulk_rename_tool != NULL) && (*bulk_rename_tool != '\0')); + g_free (bulk_rename_tool); + return have_tool; } static void nautilus_files_view_destroy (GtkWidget *object) { - NautilusFilesView *view; - GList *node, *next; + NautilusFilesView *view; + GList *node, *next; - view = NAUTILUS_FILES_VIEW (object); + view = NAUTILUS_FILES_VIEW (object); - view->details->in_destruction = TRUE; - nautilus_files_view_stop_loading (view); + view->details->in_destruction = TRUE; + nautilus_files_view_stop_loading (view); - if (view->details->model) { - nautilus_directory_unref (view->details->model); - view->details->model = NULL; - } + if (view->details->model) + { + nautilus_directory_unref (view->details->model); + view->details->model = NULL; + } - for (node = view->details->scripts_directory_list; node != NULL; node = next) { - next = node->next; - remove_directory_from_scripts_directory_list (view, node->data); - } + for (node = view->details->scripts_directory_list; node != NULL; node = next) + { + next = node->next; + remove_directory_from_scripts_directory_list (view, node->data); + } - for (node = view->details->templates_directory_list; node != NULL; node = next) { - next = node->next; - remove_directory_from_templates_directory_list (view, node->data); - } + for (node = view->details->templates_directory_list; node != NULL; node = next) + { + next = node->next; + remove_directory_from_templates_directory_list (view, node->data); + } - while (view->details->subdirectory_list != NULL) { - nautilus_files_view_remove_subdirectory (view, - view->details->subdirectory_list->data); - } + while (view->details->subdirectory_list != NULL) + { + nautilus_files_view_remove_subdirectory (view, + view->details->subdirectory_list->data); + } - remove_update_context_menus_timeout_callback (view); - remove_update_status_idle_callback (view); + remove_update_context_menus_timeout_callback (view); + remove_update_status_idle_callback (view); - if (view->details->display_selection_idle_id != 0) { - g_source_remove (view->details->display_selection_idle_id); - view->details->display_selection_idle_id = 0; - } + if (view->details->display_selection_idle_id != 0) + { + g_source_remove (view->details->display_selection_idle_id); + view->details->display_selection_idle_id = 0; + } - if (view->details->reveal_selection_idle_id != 0) { - g_source_remove (view->details->reveal_selection_idle_id); - view->details->reveal_selection_idle_id = 0; - } + if (view->details->reveal_selection_idle_id != 0) + { + g_source_remove (view->details->reveal_selection_idle_id); + view->details->reveal_selection_idle_id = 0; + } - if (view->details->floating_bar_set_status_timeout_id != 0) { - g_source_remove (view->details->floating_bar_set_status_timeout_id); - view->details->floating_bar_set_status_timeout_id = 0; - } + if (view->details->floating_bar_set_status_timeout_id != 0) + { + g_source_remove (view->details->floating_bar_set_status_timeout_id); + view->details->floating_bar_set_status_timeout_id = 0; + } - if (view->details->floating_bar_loading_timeout_id != 0) { - g_source_remove (view->details->floating_bar_loading_timeout_id); - view->details->floating_bar_loading_timeout_id = 0; - } + if (view->details->floating_bar_loading_timeout_id != 0) + { + g_source_remove (view->details->floating_bar_loading_timeout_id); + view->details->floating_bar_loading_timeout_id = 0; + } - g_signal_handlers_disconnect_by_func (nautilus_preferences, - schedule_update_context_menus, view); - g_signal_handlers_disconnect_by_func (nautilus_preferences, - click_policy_changed_callback, view); - g_signal_handlers_disconnect_by_func (nautilus_preferences, - sort_directories_first_changed_callback, view); - g_signal_handlers_disconnect_by_func (gtk_filechooser_preferences, - show_hidden_files_changed_callback, view); - g_signal_handlers_disconnect_by_func (nautilus_window_state, - nautilus_files_view_display_selection_info, view); - g_signal_handlers_disconnect_by_func (gnome_lockdown_preferences, - schedule_update_context_menus, view); - g_signal_handlers_disconnect_by_func (nautilus_trash_monitor_get (), - nautilus_files_view_trash_state_changed_callback, view); - g_signal_handlers_disconnect_by_func (nautilus_clipboard_monitor_get (), - clipboard_changed_callback, view); + g_signal_handlers_disconnect_by_func (nautilus_preferences, + schedule_update_context_menus, view); + g_signal_handlers_disconnect_by_func (nautilus_preferences, + click_policy_changed_callback, view); + g_signal_handlers_disconnect_by_func (nautilus_preferences, + sort_directories_first_changed_callback, view); + g_signal_handlers_disconnect_by_func (gtk_filechooser_preferences, + show_hidden_files_changed_callback, view); + g_signal_handlers_disconnect_by_func (nautilus_window_state, + nautilus_files_view_display_selection_info, view); + g_signal_handlers_disconnect_by_func (gnome_lockdown_preferences, + schedule_update_context_menus, view); + g_signal_handlers_disconnect_by_func (nautilus_trash_monitor_get (), + nautilus_files_view_trash_state_changed_callback, view); + g_signal_handlers_disconnect_by_func (nautilus_clipboard_monitor_get (), + clipboard_changed_callback, view); - nautilus_file_unref (view->details->directory_as_file); - view->details->directory_as_file = NULL; + nautilus_file_unref (view->details->directory_as_file); + view->details->directory_as_file = NULL; - g_clear_object (&view->details->search_query); - g_clear_object (&view->details->location); + g_clear_object (&view->details->search_query); + g_clear_object (&view->details->location); - /* We don't own the slot, so no unref */ - view->details->slot = NULL; + /* We don't own the slot, so no unref */ + view->details->slot = NULL; - GTK_WIDGET_CLASS (nautilus_files_view_parent_class)->destroy (object); + GTK_WIDGET_CLASS (nautilus_files_view_parent_class)->destroy (object); } static void nautilus_files_view_finalize (GObject *object) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (object); + view = NAUTILUS_FILES_VIEW (object); - g_clear_object (&view->details->view_action_group); - g_clear_object (&view->details->background_menu); - g_clear_object (&view->details->selection_menu); - g_clear_object (&view->details->toolbar_menu_sections->zoom_section); - g_clear_object (&view->details->toolbar_menu_sections->extended_section); - g_clear_object (&view->details->rename_file_controller); - g_clear_object (&view->details->new_folder_controller); - g_clear_object (&view->details->compress_controller); - g_free (view->details->toolbar_menu_sections); + g_clear_object (&view->details->view_action_group); + g_clear_object (&view->details->background_menu); + g_clear_object (&view->details->selection_menu); + g_clear_object (&view->details->toolbar_menu_sections->zoom_section); + g_clear_object (&view->details->toolbar_menu_sections->extended_section); + g_clear_object (&view->details->rename_file_controller); + g_clear_object (&view->details->new_folder_controller); + g_clear_object (&view->details->compress_controller); + g_free (view->details->toolbar_menu_sections); - g_hash_table_destroy (view->details->non_ready_files); - g_hash_table_destroy (view->details->pending_reveal); + g_hash_table_destroy (view->details->non_ready_files); + g_hash_table_destroy (view->details->pending_reveal); - G_OBJECT_CLASS (nautilus_files_view_parent_class)->finalize (object); + G_OBJECT_CLASS (nautilus_files_view_parent_class)->finalize (object); } /** @@ -2915,328 +3058,388 @@ nautilus_files_view_finalize (GObject *object) void nautilus_files_view_display_selection_info (NautilusFilesView *view) { - GList *selection; - goffset non_folder_size; - gboolean non_folder_size_known; - guint non_folder_count, folder_count, folder_item_count; - gboolean folder_item_count_known; - guint file_item_count; - GList *p; - char *first_item_name; - char *non_folder_count_str; - char *non_folder_item_count_str; - char *folder_count_str; - char *folder_item_count_str; - char *primary_status; - char *detail_status; - NautilusFile *file; - - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - - folder_item_count_known = TRUE; - folder_count = 0; - folder_item_count = 0; - non_folder_count = 0; - non_folder_size_known = FALSE; - non_folder_size = 0; - first_item_name = NULL; - folder_count_str = NULL; - folder_item_count_str = NULL; - non_folder_count_str = NULL; - non_folder_item_count_str = NULL; - - for (p = selection; p != NULL; p = p->next) { - file = p->data; - if (nautilus_file_is_directory (file)) { - folder_count++; - if (nautilus_file_get_directory_item_count (file, &file_item_count, NULL)) { - folder_item_count += file_item_count; - } else { - folder_item_count_known = FALSE; - } - } else { - non_folder_count++; - if (!nautilus_file_can_get_size (file)) { - non_folder_size_known = TRUE; - non_folder_size += nautilus_file_get_size (file); - } - } - - if (first_item_name == NULL) { - first_item_name = nautilus_file_get_display_name (file); - } + GList *selection; + goffset non_folder_size; + gboolean non_folder_size_known; + guint non_folder_count, folder_count, folder_item_count; + gboolean folder_item_count_known; + guint file_item_count; + GList *p; + char *first_item_name; + char *non_folder_count_str; + char *non_folder_item_count_str; + char *folder_count_str; + char *folder_item_count_str; + char *primary_status; + char *detail_status; + NautilusFile *file; + + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + + folder_item_count_known = TRUE; + folder_count = 0; + folder_item_count = 0; + non_folder_count = 0; + non_folder_size_known = FALSE; + non_folder_size = 0; + first_item_name = NULL; + folder_count_str = NULL; + folder_item_count_str = NULL; + non_folder_count_str = NULL; + non_folder_item_count_str = NULL; + + for (p = selection; p != NULL; p = p->next) + { + file = p->data; + if (nautilus_file_is_directory (file)) + { + folder_count++; + if (nautilus_file_get_directory_item_count (file, &file_item_count, NULL)) + { + folder_item_count += file_item_count; + } + else + { + folder_item_count_known = FALSE; + } + } + else + { + non_folder_count++; + if (!nautilus_file_can_get_size (file)) + { + non_folder_size_known = TRUE; + non_folder_size += nautilus_file_get_size (file); + } } - nautilus_file_list_free (selection); - - /* Break out cases for localization's sake. But note that there are still pieces - * being assembled in a particular order, which may be a problem for some localizers. - */ + if (first_item_name == NULL) + { + first_item_name = nautilus_file_get_display_name (file); + } + } - if (folder_count != 0) { - if (folder_count == 1 && non_folder_count == 0) { - folder_count_str = g_strdup_printf (_("“%s” selected"), first_item_name); - } else { - folder_count_str = g_strdup_printf (ngettext("%'d folder selected", - "%'d folders selected", - folder_count), - folder_count); - } + nautilus_file_list_free (selection); - if (folder_count == 1) { - if (!folder_item_count_known) { - folder_item_count_str = g_strdup (""); - } else { - folder_item_count_str = g_strdup_printf (ngettext("(containing %'d item)", - "(containing %'d items)", - folder_item_count), - folder_item_count); - } - } - else { - if (!folder_item_count_known) { - folder_item_count_str = g_strdup (""); - } else { - /* translators: this is preceded with a string of form 'N folders' (N more than 1) */ - folder_item_count_str = g_strdup_printf (ngettext("(containing a total of %'d item)", - "(containing a total of %'d items)", - folder_item_count), - folder_item_count); - } + /* Break out cases for localization's sake. But note that there are still pieces + * being assembled in a particular order, which may be a problem for some localizers. + */ - } + if (folder_count != 0) + { + if (folder_count == 1 && non_folder_count == 0) + { + folder_count_str = g_strdup_printf (_("“%s” selected"), first_item_name); + } + else + { + folder_count_str = g_strdup_printf (ngettext ("%'d folder selected", + "%'d folders selected", + folder_count), + folder_count); } - if (non_folder_count != 0) { - if (folder_count == 0) { - if (non_folder_count == 1) { - non_folder_count_str = g_strdup_printf (_("“%s” selected"), - first_item_name); - } else { - non_folder_count_str = g_strdup_printf (ngettext("%'d item selected", - "%'d items selected", - non_folder_count), - non_folder_count); - } - } else { - /* Folders selected also, use "other" terminology */ - non_folder_count_str = g_strdup_printf (ngettext("%'d other item selected", - "%'d other items selected", - non_folder_count), - non_folder_count); - } - - if (non_folder_size_known) { - char *size_string; - - size_string = g_format_size (non_folder_size); - /* This is marked for translation in case a localiser - * needs to use something other than parentheses. The - * the message in parentheses is the size of the selected items. - */ - non_folder_item_count_str = g_strdup_printf (_("(%s)"), size_string); - g_free (size_string); - } else { - non_folder_item_count_str = g_strdup (""); - } + if (folder_count == 1) + { + if (!folder_item_count_known) + { + folder_item_count_str = g_strdup (""); + } + else + { + folder_item_count_str = g_strdup_printf (ngettext ("(containing %'d item)", + "(containing %'d items)", + folder_item_count), + folder_item_count); + } } + else + { + if (!folder_item_count_known) + { + folder_item_count_str = g_strdup (""); + } + else + { + /* translators: this is preceded with a string of form 'N folders' (N more than 1) */ + folder_item_count_str = g_strdup_printf (ngettext ("(containing a total of %'d item)", + "(containing a total of %'d items)", + folder_item_count), + folder_item_count); + } + } + } - if (folder_count == 0 && non_folder_count == 0) { - primary_status = NULL; - detail_status = NULL; - } else if (folder_count == 0) { - primary_status = g_strdup (non_folder_count_str); - detail_status = g_strdup (non_folder_item_count_str); - } else if (non_folder_count == 0) { - primary_status = g_strdup (folder_count_str); - detail_status = g_strdup (folder_item_count_str); - } else { - /* This is marked for translation in case a localizer - * needs to change ", " to something else. The comma - * is between the message about the number of folders - * and the number of items in those folders and the - * message about the number of other items and the - * total size of those items. - */ - primary_status = g_strdup_printf (_("%s %s, %s %s"), - folder_count_str, - folder_item_count_str, - non_folder_count_str, - non_folder_item_count_str); - detail_status = NULL; + if (non_folder_count != 0) + { + if (folder_count == 0) + { + if (non_folder_count == 1) + { + non_folder_count_str = g_strdup_printf (_("“%s” selected"), + first_item_name); + } + else + { + non_folder_count_str = g_strdup_printf (ngettext ("%'d item selected", + "%'d items selected", + non_folder_count), + non_folder_count); + } } + else + { + /* Folders selected also, use "other" terminology */ + non_folder_count_str = g_strdup_printf (ngettext ("%'d other item selected", + "%'d other items selected", + non_folder_count), + non_folder_count); + } + + if (non_folder_size_known) + { + char *size_string; + + size_string = g_format_size (non_folder_size); + /* This is marked for translation in case a localiser + * needs to use something other than parentheses. The + * the message in parentheses is the size of the selected items. + */ + non_folder_item_count_str = g_strdup_printf (_("(%s)"), size_string); + g_free (size_string); + } + else + { + non_folder_item_count_str = g_strdup (""); + } + } + + if (folder_count == 0 && non_folder_count == 0) + { + primary_status = NULL; + detail_status = NULL; + } + else if (folder_count == 0) + { + primary_status = g_strdup (non_folder_count_str); + detail_status = g_strdup (non_folder_item_count_str); + } + else if (non_folder_count == 0) + { + primary_status = g_strdup (folder_count_str); + detail_status = g_strdup (folder_item_count_str); + } + else + { + /* This is marked for translation in case a localizer + * needs to change ", " to something else. The comma + * is between the message about the number of folders + * and the number of items in those folders and the + * message about the number of other items and the + * total size of those items. + */ + primary_status = g_strdup_printf (_("%s %s, %s %s"), + folder_count_str, + folder_item_count_str, + non_folder_count_str, + non_folder_item_count_str); + detail_status = NULL; + } - g_free (first_item_name); - g_free (folder_count_str); - g_free (folder_item_count_str); - g_free (non_folder_count_str); - g_free (non_folder_item_count_str); + g_free (first_item_name); + g_free (folder_count_str); + g_free (folder_item_count_str); + g_free (non_folder_count_str); + g_free (non_folder_item_count_str); - set_floating_bar_status (view, primary_status, detail_status); + set_floating_bar_status (view, primary_status, detail_status); - g_free (primary_status); - g_free (detail_status); + g_free (primary_status); + g_free (detail_status); } static void nautilus_files_view_send_selection_change (NautilusFilesView *view) { - g_signal_emit (view, signals[SELECTION_CHANGED], 0); + g_signal_emit (view, signals[SELECTION_CHANGED], 0); } static void nautilus_files_view_set_location (NautilusView *view, GFile *location) { - NautilusDirectory *directory; - NautilusFilesView *files_view; - - nautilus_profile_start (NULL); - files_view = NAUTILUS_FILES_VIEW (view); - directory = nautilus_directory_get (location); - - nautilus_files_view_stop_loading (files_view); - /* In case we want to load a previous search we need to extract the real - * location and the search location, and load the directory when everything - * is ready. That's why we cannot use the nautilus_view_set_query, because - * to set a query we need a previous location loaded, but to load a search - * location we need to know the real location behind it. */ - if (NAUTILUS_IS_SEARCH_DIRECTORY (directory)) { - NautilusQuery *previous_query; - NautilusDirectory *base_model; - - base_model = nautilus_search_directory_get_base_model (NAUTILUS_SEARCH_DIRECTORY (directory)); - previous_query = nautilus_search_directory_get_query (NAUTILUS_SEARCH_DIRECTORY (directory)); - set_search_query_internal (files_view, previous_query, base_model); - g_object_unref (previous_query); - } else { - load_directory (NAUTILUS_FILES_VIEW (view), directory); - } - nautilus_directory_unref (directory); - nautilus_profile_end (NULL); + NautilusDirectory *directory; + NautilusFilesView *files_view; + + nautilus_profile_start (NULL); + files_view = NAUTILUS_FILES_VIEW (view); + directory = nautilus_directory_get (location); + + nautilus_files_view_stop_loading (files_view); + /* In case we want to load a previous search we need to extract the real + * location and the search location, and load the directory when everything + * is ready. That's why we cannot use the nautilus_view_set_query, because + * to set a query we need a previous location loaded, but to load a search + * location we need to know the real location behind it. */ + if (NAUTILUS_IS_SEARCH_DIRECTORY (directory)) + { + NautilusQuery *previous_query; + NautilusDirectory *base_model; + + base_model = nautilus_search_directory_get_base_model (NAUTILUS_SEARCH_DIRECTORY (directory)); + previous_query = nautilus_search_directory_get_query (NAUTILUS_SEARCH_DIRECTORY (directory)); + set_search_query_internal (files_view, previous_query, base_model); + g_object_unref (previous_query); + } + else + { + load_directory (NAUTILUS_FILES_VIEW (view), directory); + } + nautilus_directory_unref (directory); + nautilus_profile_end (NULL); } static gboolean reveal_selection_idle_callback (gpointer data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (data); + view = NAUTILUS_FILES_VIEW (data); - view->details->reveal_selection_idle_id = 0; - nautilus_files_view_reveal_selection (view); + view->details->reveal_selection_idle_id = 0; + nautilus_files_view_reveal_selection (view); - return FALSE; + return FALSE; } static void nautilus_files_view_check_empty_states (NautilusFilesView *view) { - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->check_empty_states (view); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->check_empty_states (view); } static void real_check_empty_states (NautilusFilesView *view) { - gtk_widget_hide (view->details->no_search_results_widget); - gtk_widget_hide (view->details->folder_is_empty_widget); - if (!view->details->loading && - nautilus_files_view_is_empty (view)) { - if (nautilus_view_is_searching (NAUTILUS_VIEW (view))) { - gtk_widget_show (view->details->no_search_results_widget); - } else { - gtk_widget_show (view->details->folder_is_empty_widget); - } + gtk_widget_hide (view->details->no_search_results_widget); + gtk_widget_hide (view->details->folder_is_empty_widget); + if (!view->details->loading && + nautilus_files_view_is_empty (view)) + { + if (nautilus_view_is_searching (NAUTILUS_VIEW (view))) + { + gtk_widget_show (view->details->no_search_results_widget); + } + else + { + gtk_widget_show (view->details->folder_is_empty_widget); } + } } static void done_loading (NautilusFilesView *view, gboolean all_files_seen) { - GList *pending_selection; - GList *selection; - gboolean do_reveal = FALSE; + GList *pending_selection; + GList *selection; + gboolean do_reveal = FALSE; - if (!view->details->loading) { - return; - } + if (!view->details->loading) + { + return; + } + + nautilus_profile_start (NULL); + + if (!view->details->in_destruction) + { + remove_loading_floating_bar (view); + schedule_update_context_menus (view); + schedule_update_status (view); + nautilus_files_view_update_toolbar_menus (view); + reset_update_interval (view); - nautilus_profile_start (NULL); + pending_selection = view->details->pending_selection; + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - if (!view->details->in_destruction) { - remove_loading_floating_bar (view); - schedule_update_context_menus (view); - schedule_update_status (view); - nautilus_files_view_update_toolbar_menus (view); - reset_update_interval (view); + if (nautilus_view_is_searching (NAUTILUS_VIEW (view)) && + all_files_seen && !selection && !pending_selection) + { + nautilus_files_view_select_first (view); + do_reveal = TRUE; + } + else if (pending_selection != NULL && all_files_seen) + { + view->details->pending_selection = NULL; - pending_selection = view->details->pending_selection; - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + nautilus_files_view_call_set_selection (view, pending_selection); + do_reveal = TRUE; + } - if (nautilus_view_is_searching (NAUTILUS_VIEW (view)) && - all_files_seen && !selection && !pending_selection) { - nautilus_files_view_select_first (view); - do_reveal = TRUE; - } else if (pending_selection != NULL && all_files_seen) { - view->details->pending_selection = NULL; + if (selection) + { + g_list_free_full (selection, g_object_unref); + } - nautilus_files_view_call_set_selection (view, pending_selection); - do_reveal = TRUE; - } + if (pending_selection) + { + g_list_free_full (pending_selection, g_object_unref); + } - if (selection) - g_list_free_full (selection, g_object_unref); - - if (pending_selection) - g_list_free_full (pending_selection, g_object_unref); - - if (do_reveal) { - if (NAUTILUS_IS_LIST_VIEW (view)) { - /* HACK: We should be able to directly call reveal_selection here, - * but at this point the GtkTreeView hasn't allocated the new nodes - * yet, and it has a bug in the scroll calculation dealing with this - * special case. It would always make the selection the top row, even - * if no scrolling would be neccessary to reveal it. So we let it - * allocate before revealing. - */ - if (view->details->reveal_selection_idle_id != 0) { - g_source_remove (view->details->reveal_selection_idle_id); - } - view->details->reveal_selection_idle_id = - g_idle_add (reveal_selection_idle_callback, view); - } else { - nautilus_files_view_reveal_selection (view); - } + if (do_reveal) + { + if (NAUTILUS_IS_LIST_VIEW (view)) + { + /* HACK: We should be able to directly call reveal_selection here, + * but at this point the GtkTreeView hasn't allocated the new nodes + * yet, and it has a bug in the scroll calculation dealing with this + * special case. It would always make the selection the top row, even + * if no scrolling would be neccessary to reveal it. So we let it + * allocate before revealing. + */ + if (view->details->reveal_selection_idle_id != 0) + { + g_source_remove (view->details->reveal_selection_idle_id); } - nautilus_files_view_display_selection_info (view); + view->details->reveal_selection_idle_id = + g_idle_add (reveal_selection_idle_callback, view); + } + else + { + nautilus_files_view_reveal_selection (view); + } } + nautilus_files_view_display_selection_info (view); + } - view->details->loading = FALSE; - g_signal_emit (view, signals[END_LOADING], 0, all_files_seen); - g_object_notify (G_OBJECT (view), "is-loading"); + view->details->loading = FALSE; + g_signal_emit (view, signals[END_LOADING], 0, all_files_seen); + g_object_notify (G_OBJECT (view), "is-loading"); - if (!view->details->in_destruction) { - nautilus_files_view_check_empty_states (view); - } + if (!view->details->in_destruction) + { + nautilus_files_view_check_empty_states (view); + } - nautilus_profile_end (NULL); + nautilus_profile_end (NULL); } -typedef struct { - GHashTable *debuting_files; - GList *added_files; +typedef struct +{ + GHashTable *debuting_files; + GList *added_files; } DebutingFilesData; static void debuting_files_data_free (DebutingFilesData *data) { - g_hash_table_unref (data->debuting_files); - nautilus_file_list_free (data->added_files); - g_free (data); + g_hash_table_unref (data->debuting_files); + nautilus_file_list_free (data->added_files); + g_free (data); } /* This signal handler watch for the arrival of the icons created @@ -3249,47 +3452,51 @@ debuting_files_add_file_callback (NautilusFilesView *view, NautilusDirectory *directory, DebutingFilesData *data) { - GFile *location; + GFile *location; - nautilus_profile_start (NULL); + nautilus_profile_start (NULL); - location = nautilus_file_get_location (new_file); + location = nautilus_file_get_location (new_file); - if (g_hash_table_remove (data->debuting_files, location)) { - nautilus_file_ref (new_file); - data->added_files = g_list_prepend (data->added_files, new_file); + if (g_hash_table_remove (data->debuting_files, location)) + { + nautilus_file_ref (new_file); + data->added_files = g_list_prepend (data->added_files, new_file); - if (g_hash_table_size (data->debuting_files) == 0) { - nautilus_files_view_call_set_selection (view, data->added_files); - nautilus_files_view_reveal_selection (view); - g_signal_handlers_disconnect_by_func (view, - G_CALLBACK (debuting_files_add_file_callback), - data); - } + if (g_hash_table_size (data->debuting_files) == 0) + { + nautilus_files_view_call_set_selection (view, data->added_files); + nautilus_files_view_reveal_selection (view); + g_signal_handlers_disconnect_by_func (view, + G_CALLBACK (debuting_files_add_file_callback), + data); } + } - nautilus_profile_end (NULL); + nautilus_profile_end (NULL); - g_object_unref (location); + g_object_unref (location); } -typedef struct { - GList *added_files; - NautilusFilesView *directory_view; +typedef struct +{ + GList *added_files; + NautilusFilesView *directory_view; } CopyMoveDoneData; static void copy_move_done_data_free (CopyMoveDoneData *data) { - g_assert (data != NULL); + g_assert (data != NULL); - if (data->directory_view != NULL) { - g_object_remove_weak_pointer (G_OBJECT (data->directory_view), - (gpointer *) &data->directory_view); - } + if (data->directory_view != NULL) + { + g_object_remove_weak_pointer (G_OBJECT (data->directory_view), + (gpointer *) &data->directory_view); + } - nautilus_file_list_free (data->added_files); - g_free (data); + nautilus_file_list_free (data->added_files); + g_free (data); } static void @@ -3298,8 +3505,8 @@ pre_copy_move_add_file_callback (NautilusFilesView *view, NautilusDirectory *directory, CopyMoveDoneData *data) { - nautilus_file_ref (new_file); - data->added_files = g_list_prepend (data->added_files, new_file); + nautilus_file_ref (new_file); + data->added_files = g_list_prepend (data->added_files, new_file); } /* This needs to be called prior to nautilus_file_operations_copy_move. @@ -3310,22 +3517,22 @@ pre_copy_move_add_file_callback (NautilusFilesView *view, static CopyMoveDoneData * pre_copy_move (NautilusFilesView *directory_view) { - CopyMoveDoneData *copy_move_done_data; + CopyMoveDoneData *copy_move_done_data; - copy_move_done_data = g_new0 (CopyMoveDoneData, 1); - copy_move_done_data->directory_view = directory_view; + copy_move_done_data = g_new0 (CopyMoveDoneData, 1); + copy_move_done_data->directory_view = directory_view; - g_object_add_weak_pointer (G_OBJECT (copy_move_done_data->directory_view), - (gpointer *) ©_move_done_data->directory_view); + g_object_add_weak_pointer (G_OBJECT (copy_move_done_data->directory_view), + (gpointer *) ©_move_done_data->directory_view); - /* We need to run after the default handler adds the folder we want to - * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we - * must use connect_after. - */ - g_signal_connect (directory_view, "add-file", - G_CALLBACK (pre_copy_move_add_file_callback), copy_move_done_data); + /* We need to run after the default handler adds the folder we want to + * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we + * must use connect_after. + */ + g_signal_connect (directory_view, "add-file", + G_CALLBACK (pre_copy_move_add_file_callback), copy_move_done_data); - return copy_move_done_data; + return copy_move_done_data; } /* This function is used to pull out any debuting uris that were added @@ -3335,14 +3542,14 @@ static gboolean copy_move_done_partition_func (NautilusFile *file, gpointer callback_data) { - GFile *location; - gboolean result; + GFile *location; + gboolean result; - location = nautilus_file_get_location (file); - result = g_hash_table_remove ((GHashTable *) callback_data, location); - g_object_unref (location); + location = nautilus_file_get_location (file); + result = g_hash_table_remove ((GHashTable *) callback_data, location); + g_object_unref (location); - return result; + return result; } static gboolean @@ -3350,19 +3557,20 @@ remove_not_really_moved_files (gpointer key, gpointer value, gpointer callback_data) { - GList **added_files; - GFile *loc; + GList **added_files; + GFile *loc; - loc = key; + loc = key; - if (GPOINTER_TO_INT (value)) { - return FALSE; - } + if (GPOINTER_TO_INT (value)) + { + return FALSE; + } - added_files = callback_data; - *added_files = g_list_prepend (*added_files, - nautilus_file_get (loc)); - return TRUE; + added_files = callback_data; + *added_files = g_list_prepend (*added_files, + nautilus_file_get (loc)); + return TRUE; } /* When this function is invoked, the file operation is over, but all @@ -3377,68 +3585,73 @@ copy_move_done_callback (GHashTable *debuting_files, gboolean success, gpointer data) { - NautilusFilesView *directory_view; - CopyMoveDoneData *copy_move_done_data; - DebutingFilesData *debuting_files_data; - GList *failed_files; - - copy_move_done_data = (CopyMoveDoneData *) data; - directory_view = copy_move_done_data->directory_view; - - if (directory_view != NULL) { - g_assert (NAUTILUS_IS_FILES_VIEW (directory_view)); - - debuting_files_data = g_new (DebutingFilesData, 1); - debuting_files_data->debuting_files = g_hash_table_ref (debuting_files); - debuting_files_data->added_files = nautilus_file_list_filter (copy_move_done_data->added_files, - &failed_files, - copy_move_done_partition_func, - debuting_files); - nautilus_file_list_free (copy_move_done_data->added_files); - copy_move_done_data->added_files = failed_files; - - /* We're passed the same data used by pre_copy_move_add_file_callback, so disconnecting - * it will free data. We've already siphoned off the added_files we need, and stashed the - * directory_view pointer. - */ - g_signal_handlers_disconnect_by_func (directory_view, - G_CALLBACK (pre_copy_move_add_file_callback), - data); - - /* Any items in the debuting_files hash table that have - * "FALSE" as their value aren't really being copied - * or moved, so we can't wait for an add_file signal - * to come in for those. - */ - g_hash_table_foreach_remove (debuting_files, - remove_not_really_moved_files, - &debuting_files_data->added_files); - - if (g_hash_table_size (debuting_files) == 0) { - /* on the off-chance that all the icons have already been added */ - if (debuting_files_data->added_files != NULL) { - nautilus_files_view_call_set_selection (directory_view, - debuting_files_data->added_files); - nautilus_files_view_reveal_selection (directory_view); - } - debuting_files_data_free (debuting_files_data); - } else { - /* We need to run after the default handler adds the folder we want to - * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we - * must use connect_after. - */ - g_signal_connect_data (directory_view, - "add-file", - G_CALLBACK (debuting_files_add_file_callback), - debuting_files_data, - (GClosureNotify) debuting_files_data_free, - G_CONNECT_AFTER); - } - /* Schedule menu update for undo items */ - schedule_update_context_menus (directory_view); + NautilusFilesView *directory_view; + CopyMoveDoneData *copy_move_done_data; + DebutingFilesData *debuting_files_data; + GList *failed_files; + + copy_move_done_data = (CopyMoveDoneData *) data; + directory_view = copy_move_done_data->directory_view; + + if (directory_view != NULL) + { + g_assert (NAUTILUS_IS_FILES_VIEW (directory_view)); + + debuting_files_data = g_new (DebutingFilesData, 1); + debuting_files_data->debuting_files = g_hash_table_ref (debuting_files); + debuting_files_data->added_files = nautilus_file_list_filter (copy_move_done_data->added_files, + &failed_files, + copy_move_done_partition_func, + debuting_files); + nautilus_file_list_free (copy_move_done_data->added_files); + copy_move_done_data->added_files = failed_files; + + /* We're passed the same data used by pre_copy_move_add_file_callback, so disconnecting + * it will free data. We've already siphoned off the added_files we need, and stashed the + * directory_view pointer. + */ + g_signal_handlers_disconnect_by_func (directory_view, + G_CALLBACK (pre_copy_move_add_file_callback), + data); + + /* Any items in the debuting_files hash table that have + * "FALSE" as their value aren't really being copied + * or moved, so we can't wait for an add_file signal + * to come in for those. + */ + g_hash_table_foreach_remove (debuting_files, + remove_not_really_moved_files, + &debuting_files_data->added_files); + + if (g_hash_table_size (debuting_files) == 0) + { + /* on the off-chance that all the icons have already been added */ + if (debuting_files_data->added_files != NULL) + { + nautilus_files_view_call_set_selection (directory_view, + debuting_files_data->added_files); + nautilus_files_view_reveal_selection (directory_view); + } + debuting_files_data_free (debuting_files_data); + } + else + { + /* We need to run after the default handler adds the folder we want to + * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we + * must use connect_after. + */ + g_signal_connect_data (directory_view, + "add-file", + G_CALLBACK (debuting_files_add_file_callback), + debuting_files_data, + (GClosureNotify) debuting_files_data_free, + G_CONNECT_AFTER); } + /* Schedule menu update for undo items */ + schedule_update_context_menus (directory_view); + } - copy_move_done_data_free (copy_move_done_data); + copy_move_done_data_free (copy_move_done_data); } static gboolean @@ -3446,12 +3659,13 @@ view_file_still_belongs (NautilusFilesView *view, NautilusFile *file, NautilusDirectory *directory) { - if (view->details->model != directory && - g_list_find (view->details->subdirectory_list, directory) == NULL) { - return FALSE; - } + if (view->details->model != directory && + g_list_find (view->details->subdirectory_list, directory) == NULL) + { + return FALSE; + } - return nautilus_directory_contains_file (directory, file); + return nautilus_directory_contains_file (directory, file); } static gboolean @@ -3459,15 +3673,15 @@ still_should_show_file (NautilusFilesView *view, NautilusFile *file, NautilusDirectory *directory) { - return nautilus_files_view_should_show_file (view, file) && - view_file_still_belongs (view, file, directory); + return nautilus_files_view_should_show_file (view, file) && + view_file_still_belongs (view, file, directory); } static gboolean ready_to_load (NautilusFile *file) { - return nautilus_file_check_if_ready (file, - NAUTILUS_FILE_ATTRIBUTES_FOR_ICON); + return nautilus_file_check_if_ready (file, + NAUTILUS_FILE_ATTRIBUTES_FOR_ICON); } static int @@ -3475,26 +3689,31 @@ compare_files_cover (gconstpointer a, gconstpointer b, gpointer callback_data) { - const FileAndDirectory *fad1, *fad2; - NautilusFilesView *view; + const FileAndDirectory *fad1, *fad2; + NautilusFilesView *view; - view = callback_data; - fad1 = a; fad2 = b; + view = callback_data; + fad1 = a; + fad2 = b; - if (fad1->directory < fad2->directory) { - return -1; - } else if (fad1->directory > fad2->directory) { - return 1; - } else { - return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->compare_files (view, fad1->file, fad2->file); - } + if (fad1->directory < fad2->directory) + { + return -1; + } + else if (fad1->directory > fad2->directory) + { + return 1; + } + else + { + return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->compare_files (view, fad1->file, fad2->file); + } } static void sort_files (NautilusFilesView *view, GList **list) { - *list = g_list_sort_with_data (*list, compare_files_cover, view); - + *list = g_list_sort_with_data (*list, compare_files_cover, view); } /* Go through all the new added and changed files. @@ -3505,323 +3724,354 @@ sort_files (NautilusFilesView *view, static void process_new_files (NautilusFilesView *view) { - GList *new_added_files, *new_changed_files, *old_added_files, *old_changed_files; - GHashTable *non_ready_files; - GList *node, *next; - FileAndDirectory *pending; - gboolean in_non_ready; - - new_added_files = view->details->new_added_files; - view->details->new_added_files = NULL; - new_changed_files = view->details->new_changed_files; - view->details->new_changed_files = NULL; - - non_ready_files = view->details->non_ready_files; - - old_added_files = view->details->old_added_files; - old_changed_files = view->details->old_changed_files; - - /* Newly added files go into the old_added_files list if they're - * ready, and into the hash table if they're not. - */ - for (node = new_added_files; node != NULL; node = next) { - next = node->next; - pending = (FileAndDirectory *)node->data; - in_non_ready = g_hash_table_lookup (non_ready_files, pending) != NULL; - if (nautilus_files_view_should_show_file (view, pending->file)) { - if (ready_to_load (pending->file)) { - if (in_non_ready) { - g_hash_table_remove (non_ready_files, pending); - } - new_added_files = g_list_delete_link (new_added_files, node); - old_added_files = g_list_prepend (old_added_files, pending); - } else { - if (!in_non_ready) { - new_added_files = g_list_delete_link (new_added_files, node); - g_hash_table_insert (non_ready_files, pending, pending); - } - } + GList *new_added_files, *new_changed_files, *old_added_files, *old_changed_files; + GHashTable *non_ready_files; + GList *node, *next; + FileAndDirectory *pending; + gboolean in_non_ready; + + new_added_files = view->details->new_added_files; + view->details->new_added_files = NULL; + new_changed_files = view->details->new_changed_files; + view->details->new_changed_files = NULL; + + non_ready_files = view->details->non_ready_files; + + old_added_files = view->details->old_added_files; + old_changed_files = view->details->old_changed_files; + + /* Newly added files go into the old_added_files list if they're + * ready, and into the hash table if they're not. + */ + for (node = new_added_files; node != NULL; node = next) + { + next = node->next; + pending = (FileAndDirectory *) node->data; + in_non_ready = g_hash_table_lookup (non_ready_files, pending) != NULL; + if (nautilus_files_view_should_show_file (view, pending->file)) + { + if (ready_to_load (pending->file)) + { + if (in_non_ready) + { + g_hash_table_remove (non_ready_files, pending); } - } - file_and_directory_list_free (new_added_files); - - /* Newly changed files go into the old_added_files list if they're ready - * and were seen non-ready in the past, into the old_changed_files list - * if they are read and were not seen non-ready in the past, and into - * the hash table if they're not ready. - */ - for (node = new_changed_files; node != NULL; node = next) { - next = node->next; - pending = (FileAndDirectory *)node->data; - if (!still_should_show_file (view, pending->file, pending->directory) || ready_to_load (pending->file)) { - if (g_hash_table_lookup (non_ready_files, pending) != NULL) { - g_hash_table_remove (non_ready_files, pending); - if (still_should_show_file (view, pending->file, pending->directory)) { - new_changed_files = g_list_delete_link (new_changed_files, node); - old_added_files = g_list_prepend (old_added_files, pending); - } - } else { - new_changed_files = g_list_delete_link (new_changed_files, node); - old_changed_files = g_list_prepend (old_changed_files, pending); - } + new_added_files = g_list_delete_link (new_added_files, node); + old_added_files = g_list_prepend (old_added_files, pending); + } + else + { + if (!in_non_ready) + { + new_added_files = g_list_delete_link (new_added_files, node); + g_hash_table_insert (non_ready_files, pending, pending); } + } } - file_and_directory_list_free (new_changed_files); - - /* If any files were added to old_added_files, then resort it. */ - if (old_added_files != view->details->old_added_files) { - view->details->old_added_files = old_added_files; - sort_files (view, &view->details->old_added_files); + } + file_and_directory_list_free (new_added_files); + + /* Newly changed files go into the old_added_files list if they're ready + * and were seen non-ready in the past, into the old_changed_files list + * if they are read and were not seen non-ready in the past, and into + * the hash table if they're not ready. + */ + for (node = new_changed_files; node != NULL; node = next) + { + next = node->next; + pending = (FileAndDirectory *) node->data; + if (!still_should_show_file (view, pending->file, pending->directory) || ready_to_load (pending->file)) + { + if (g_hash_table_lookup (non_ready_files, pending) != NULL) + { + g_hash_table_remove (non_ready_files, pending); + if (still_should_show_file (view, pending->file, pending->directory)) + { + new_changed_files = g_list_delete_link (new_changed_files, node); + old_added_files = g_list_prepend (old_added_files, pending); + } + } + else + { + new_changed_files = g_list_delete_link (new_changed_files, node); + old_changed_files = g_list_prepend (old_changed_files, pending); + } } + } + file_and_directory_list_free (new_changed_files); - /* Resort old_changed_files too, since file attributes - * relevant to sorting could have changed. - */ - if (old_changed_files != view->details->old_changed_files) { - view->details->old_changed_files = old_changed_files; - sort_files (view, &view->details->old_changed_files); - } + /* If any files were added to old_added_files, then resort it. */ + if (old_added_files != view->details->old_added_files) + { + view->details->old_added_files = old_added_files; + sort_files (view, &view->details->old_added_files); + } + /* Resort old_changed_files too, since file attributes + * relevant to sorting could have changed. + */ + if (old_changed_files != view->details->old_changed_files) + { + view->details->old_changed_files = old_changed_files; + sort_files (view, &view->details->old_changed_files); + } } static void on_end_file_changes (NautilusFilesView *view) { - /* Addition and removal of files modify the empty state */ - nautilus_files_view_check_empty_states (view); - /* If the view is empty, zoom slider and sort menu are insensitive */ - nautilus_files_view_update_toolbar_menus (view); - - /* Reveal files that were pending to be revealed, only if all of them - * were acknowledged by the view - */ - if (g_hash_table_size (view->details->pending_reveal) > 0) { - GList *keys; - GList *l; - gboolean all_files_acknowledged = TRUE; - - keys = g_hash_table_get_keys (view->details->pending_reveal); - for (l = keys; l && all_files_acknowledged; l = l->next) { - all_files_acknowledged = GPOINTER_TO_UINT (g_hash_table_lookup (view->details->pending_reveal, - l->data)); - } + /* Addition and removal of files modify the empty state */ + nautilus_files_view_check_empty_states (view); + /* If the view is empty, zoom slider and sort menu are insensitive */ + nautilus_files_view_update_toolbar_menus (view); + + /* Reveal files that were pending to be revealed, only if all of them + * were acknowledged by the view + */ + if (g_hash_table_size (view->details->pending_reveal) > 0) + { + GList *keys; + GList *l; + gboolean all_files_acknowledged = TRUE; - if (all_files_acknowledged) { - nautilus_files_view_set_selection (NAUTILUS_VIEW (view), keys); - nautilus_files_view_reveal_selection (view); - g_hash_table_remove_all (view->details->pending_reveal); - } + keys = g_hash_table_get_keys (view->details->pending_reveal); + for (l = keys; l && all_files_acknowledged; l = l->next) + { + all_files_acknowledged = GPOINTER_TO_UINT (g_hash_table_lookup (view->details->pending_reveal, + l->data)); + } - g_list_free (keys); + if (all_files_acknowledged) + { + nautilus_files_view_set_selection (NAUTILUS_VIEW (view), keys); + nautilus_files_view_reveal_selection (view); + g_hash_table_remove_all (view->details->pending_reveal); } + + g_list_free (keys); + } } static void process_old_files (NautilusFilesView *view) { - GList *files_added, *files_changed, *node; - FileAndDirectory *pending; - GList *selection, *files; + GList *files_added, *files_changed, *node; + FileAndDirectory *pending; + GList *selection, *files; - files_added = view->details->old_added_files; - files_changed = view->details->old_changed_files; + files_added = view->details->old_added_files; + files_changed = view->details->old_changed_files; - if (files_added != NULL || files_changed != NULL) { - gboolean send_selection_change = FALSE; + if (files_added != NULL || files_changed != NULL) + { + gboolean send_selection_change = FALSE; - g_signal_emit (view, signals[BEGIN_FILE_CHANGES], 0); + g_signal_emit (view, signals[BEGIN_FILE_CHANGES], 0); - for (node = files_added; node != NULL; node = node->next) { - pending = node->data; - g_signal_emit (view, - signals[ADD_FILE], 0, pending->file, pending->directory); - /* Acknowledge the files that were pending to be revealed */ - if (g_hash_table_contains (view->details->pending_reveal, pending->file)) { - g_hash_table_insert (view->details->pending_reveal, - pending->file, - GUINT_TO_POINTER (TRUE)); - } - } + for (node = files_added; node != NULL; node = node->next) + { + pending = node->data; + g_signal_emit (view, + signals[ADD_FILE], 0, pending->file, pending->directory); + /* Acknowledge the files that were pending to be revealed */ + if (g_hash_table_contains (view->details->pending_reveal, pending->file)) + { + g_hash_table_insert (view->details->pending_reveal, + pending->file, + GUINT_TO_POINTER (TRUE)); + } + } - for (node = files_changed; node != NULL; node = node->next) { - gboolean should_show_file; - pending = node->data; - should_show_file = still_should_show_file (view, pending->file, pending->directory); - g_signal_emit (view, - signals[should_show_file ? FILE_CHANGED : REMOVE_FILE], 0, - pending->file, pending->directory); - - /* Acknowledge the files that were pending to be revealed */ - if (g_hash_table_contains (view->details->pending_reveal, pending->file)) { - if (should_show_file) { - g_hash_table_insert (view->details->pending_reveal, - pending->file, - GUINT_TO_POINTER (TRUE)); - } else { - g_hash_table_remove (view->details->pending_reveal, - pending->file); - } - } + for (node = files_changed; node != NULL; node = node->next) + { + gboolean should_show_file; + pending = node->data; + should_show_file = still_should_show_file (view, pending->file, pending->directory); + g_signal_emit (view, + signals[should_show_file ? FILE_CHANGED : REMOVE_FILE], 0, + pending->file, pending->directory); + + /* Acknowledge the files that were pending to be revealed */ + if (g_hash_table_contains (view->details->pending_reveal, pending->file)) + { + if (should_show_file) + { + g_hash_table_insert (view->details->pending_reveal, + pending->file, + GUINT_TO_POINTER (TRUE)); } - - if (files_changed != NULL) { - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - files = file_and_directory_list_to_files (files_changed); - send_selection_change = eel_g_lists_sort_and_check_for_intersection - (&files, &selection); - nautilus_file_list_free (files); - nautilus_file_list_free (selection); + else + { + g_hash_table_remove (view->details->pending_reveal, + pending->file); } + } + } - file_and_directory_list_free (view->details->old_added_files); - view->details->old_added_files = NULL; + if (files_changed != NULL) + { + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + files = file_and_directory_list_to_files (files_changed); + send_selection_change = eel_g_lists_sort_and_check_for_intersection + (&files, &selection); + nautilus_file_list_free (files); + nautilus_file_list_free (selection); + } - file_and_directory_list_free (view->details->old_changed_files); - view->details->old_changed_files = NULL; + file_and_directory_list_free (view->details->old_added_files); + view->details->old_added_files = NULL; - if (send_selection_change) { - /* Send a selection change since some file names could - * have changed. - */ - nautilus_files_view_send_selection_change (view); - } + file_and_directory_list_free (view->details->old_changed_files); + view->details->old_changed_files = NULL; - g_signal_emit (view, signals[END_FILE_CHANGES], 0); + if (send_selection_change) + { + /* Send a selection change since some file names could + * have changed. + */ + nautilus_files_view_send_selection_change (view); } + + g_signal_emit (view, signals[END_FILE_CHANGES], 0); + } } static void display_pending_files (NautilusFilesView *view) { - GList *selection; + GList *selection; - process_new_files (view); - process_old_files (view); + process_new_files (view); + process_old_files (view); - selection = nautilus_files_view_get_selection (NAUTILUS_VIEW (view)); + selection = nautilus_files_view_get_selection (NAUTILUS_VIEW (view)); - if (selection == NULL && - !view->details->pending_selection && - nautilus_view_is_searching (NAUTILUS_VIEW (view))) { - nautilus_files_view_select_first (view); + if (selection == NULL && + !view->details->pending_selection && + nautilus_view_is_searching (NAUTILUS_VIEW (view))) + { + nautilus_files_view_select_first (view); + } - } - - if (view->details->model != NULL - && nautilus_directory_are_all_files_seen (view->details->model) - && g_hash_table_size (view->details->non_ready_files) == 0) { - done_loading (view, TRUE); - } + if (view->details->model != NULL + && nautilus_directory_are_all_files_seen (view->details->model) + && g_hash_table_size (view->details->non_ready_files) == 0) + { + done_loading (view, TRUE); + } - nautilus_file_list_free (selection); + nautilus_file_list_free (selection); } static gboolean display_selection_info_idle_callback (gpointer data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (data); + view = NAUTILUS_FILES_VIEW (data); - g_object_ref (G_OBJECT (view)); + g_object_ref (G_OBJECT (view)); - view->details->display_selection_idle_id = 0; - nautilus_files_view_display_selection_info (view); - nautilus_files_view_send_selection_change (view); + view->details->display_selection_idle_id = 0; + nautilus_files_view_display_selection_info (view); + nautilus_files_view_send_selection_change (view); - g_object_unref (G_OBJECT (view)); + g_object_unref (G_OBJECT (view)); - return FALSE; + return FALSE; } static void remove_update_context_menus_timeout_callback (NautilusFilesView *view) { - if (view->details->update_context_menus_timeout_id != 0) { - g_source_remove (view->details->update_context_menus_timeout_id); - view->details->update_context_menus_timeout_id = 0; - } + if (view->details->update_context_menus_timeout_id != 0) + { + g_source_remove (view->details->update_context_menus_timeout_id); + view->details->update_context_menus_timeout_id = 0; + } } static void update_context_menus_if_pending (NautilusFilesView *view) { - remove_update_context_menus_timeout_callback (view); + remove_update_context_menus_timeout_callback (view); - nautilus_files_view_update_context_menus(view); + nautilus_files_view_update_context_menus (view); } static gboolean update_context_menus_timeout_callback (gpointer data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (data); + view = NAUTILUS_FILES_VIEW (data); - g_object_ref (G_OBJECT (view)); + g_object_ref (G_OBJECT (view)); - view->details->update_context_menus_timeout_id = 0; - nautilus_files_view_update_context_menus(view); + view->details->update_context_menus_timeout_id = 0; + nautilus_files_view_update_context_menus (view); - g_object_unref (G_OBJECT (view)); + g_object_unref (G_OBJECT (view)); - return FALSE; + return FALSE; } static gboolean display_pending_callback (gpointer data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (data); + view = NAUTILUS_FILES_VIEW (data); - g_object_ref (G_OBJECT (view)); + g_object_ref (G_OBJECT (view)); - view->details->display_pending_source_id = 0; + view->details->display_pending_source_id = 0; - display_pending_files (view); + display_pending_files (view); - g_object_unref (G_OBJECT (view)); + g_object_unref (G_OBJECT (view)); - return FALSE; + return FALSE; } static void schedule_idle_display_of_pending_files (NautilusFilesView *view) { - /* Get rid of a pending source as it might be a timeout */ - unschedule_display_of_pending_files (view); + /* Get rid of a pending source as it might be a timeout */ + unschedule_display_of_pending_files (view); - /* We want higher priority than the idle that handles the relayout - to avoid a resort on each add. But we still want to allow repaints - and other hight prio events while we have pending files to show. */ - view->details->display_pending_source_id = - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE - 20, - display_pending_callback, view, NULL); + /* We want higher priority than the idle that handles the relayout + * to avoid a resort on each add. But we still want to allow repaints + * and other hight prio events while we have pending files to show. */ + view->details->display_pending_source_id = + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE - 20, + display_pending_callback, view, NULL); } static void schedule_timeout_display_of_pending_files (NautilusFilesView *view, guint interval) { - /* No need to schedule an update if there's already one pending. */ - if (view->details->display_pending_source_id != 0) { - return; - } + /* No need to schedule an update if there's already one pending. */ + if (view->details->display_pending_source_id != 0) + { + return; + } - view->details->display_pending_source_id = - g_timeout_add (interval, display_pending_callback, view); + view->details->display_pending_source_id = + g_timeout_add (interval, display_pending_callback, view); } static void unschedule_display_of_pending_files (NautilusFilesView *view) { - /* Get rid of source if it's active. */ - if (view->details->display_pending_source_id != 0) { - g_source_remove (view->details->display_pending_source_id); - view->details->display_pending_source_id = 0; - } + /* Get rid of source if it's active. */ + if (view->details->display_pending_source_id != 0) + { + g_source_remove (view->details->display_pending_source_id); + view->details->display_pending_source_id = 0; + } } static void @@ -3830,91 +4080,100 @@ queue_pending_files (NautilusFilesView *view, GList *files, GList **pending_list) { - if (files == NULL) { - return; - } + if (files == NULL) + { + return; + } - *pending_list = g_list_concat (file_and_directory_list_from_files (directory, files), - *pending_list); - /* Generally we don't want to show the files while the directory is loading - * the files themselves, so we avoid jumping and oddities. However, for - * search it can be a long wait, and we actually want to show files as - * they are getting found. So for search is fine if not all files are - * seen */ - if (!view->details->loading || - (nautilus_directory_are_all_files_seen (directory) || - nautilus_view_is_searching (NAUTILUS_VIEW (view)))) { - schedule_timeout_display_of_pending_files (view, view->details->update_interval); - } + *pending_list = g_list_concat (file_and_directory_list_from_files (directory, files), + *pending_list); + /* Generally we don't want to show the files while the directory is loading + * the files themselves, so we avoid jumping and oddities. However, for + * search it can be a long wait, and we actually want to show files as + * they are getting found. So for search is fine if not all files are + * seen */ + if (!view->details->loading || + (nautilus_directory_are_all_files_seen (directory) || + nautilus_view_is_searching (NAUTILUS_VIEW (view)))) + { + schedule_timeout_display_of_pending_files (view, view->details->update_interval); + } } static void remove_changes_timeout_callback (NautilusFilesView *view) { - if (view->details->changes_timeout_id != 0) { - g_source_remove (view->details->changes_timeout_id); - view->details->changes_timeout_id = 0; - } + if (view->details->changes_timeout_id != 0) + { + g_source_remove (view->details->changes_timeout_id); + view->details->changes_timeout_id = 0; + } } static void reset_update_interval (NautilusFilesView *view) { - view->details->update_interval = UPDATE_INTERVAL_MIN; - remove_changes_timeout_callback (view); - /* Reschedule a pending timeout to idle */ - if (view->details->display_pending_source_id != 0) { - schedule_idle_display_of_pending_files (view); - } + view->details->update_interval = UPDATE_INTERVAL_MIN; + remove_changes_timeout_callback (view); + /* Reschedule a pending timeout to idle */ + if (view->details->display_pending_source_id != 0) + { + schedule_idle_display_of_pending_files (view); + } } static gboolean changes_timeout_callback (gpointer data) { - gint64 now; - gint64 time_delta; - gboolean ret; - NautilusFilesView *view; + gint64 now; + gint64 time_delta; + gboolean ret; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (data); + view = NAUTILUS_FILES_VIEW (data); - g_object_ref (G_OBJECT (view)); + g_object_ref (G_OBJECT (view)); - now = g_get_monotonic_time (); - time_delta = now - view->details->last_queued; + now = g_get_monotonic_time (); + time_delta = now - view->details->last_queued; - if (time_delta < UPDATE_INTERVAL_RESET*1000) { - if (view->details->update_interval < UPDATE_INTERVAL_MAX && - view->details->loading) { - /* Increase */ - view->details->update_interval += UPDATE_INTERVAL_INC; - } - ret = TRUE; - } else { - /* Reset */ - reset_update_interval (view); - ret = FALSE; + if (time_delta < UPDATE_INTERVAL_RESET * 1000) + { + if (view->details->update_interval < UPDATE_INTERVAL_MAX && + view->details->loading) + { + /* Increase */ + view->details->update_interval += UPDATE_INTERVAL_INC; } + ret = TRUE; + } + else + { + /* Reset */ + reset_update_interval (view); + ret = FALSE; + } - g_object_unref (G_OBJECT (view)); + g_object_unref (G_OBJECT (view)); - return ret; + return ret; } static void schedule_changes (NautilusFilesView *view) { - /* Remember when the change was queued */ - view->details->last_queued = g_get_monotonic_time (); + /* Remember when the change was queued */ + view->details->last_queued = g_get_monotonic_time (); - /* No need to schedule if there are already changes pending or during loading */ - if (view->details->changes_timeout_id != 0 || - view->details->loading) { - return; - } + /* No need to schedule if there are already changes pending or during loading */ + if (view->details->changes_timeout_id != 0 || + view->details->loading) + { + return; + } - view->details->changes_timeout_id = - g_timeout_add (UPDATE_INTERVAL_TIMEOUT_INTERVAL, changes_timeout_callback, view); + view->details->changes_timeout_id = + g_timeout_add (UPDATE_INTERVAL_TIMEOUT_INTERVAL, changes_timeout_callback, view); } static void @@ -3922,28 +4181,28 @@ files_added_callback (NautilusDirectory *directory, GList *files, gpointer callback_data) { - NautilusFilesView *view; - GtkWindow *window; - char *uri; + NautilusFilesView *view; + GtkWindow *window; + char *uri; - view = NAUTILUS_FILES_VIEW (callback_data); + view = NAUTILUS_FILES_VIEW (callback_data); - nautilus_profile_start (NULL); + nautilus_profile_start (NULL); - window = nautilus_files_view_get_containing_window (view); - uri = nautilus_files_view_get_uri (view); - DEBUG_FILES (files, "Files added in window %p: %s", - window, uri ? uri : "(no directory)"); - g_free (uri); + window = nautilus_files_view_get_containing_window (view); + uri = nautilus_files_view_get_uri (view); + DEBUG_FILES (files, "Files added in window %p: %s", + window, uri ? uri : "(no directory)"); + g_free (uri); - schedule_changes (view); + schedule_changes (view); - queue_pending_files (view, directory, files, &view->details->new_added_files); + queue_pending_files (view, directory, files, &view->details->new_added_files); - /* The number of items could have changed */ - schedule_update_status (view); + /* The number of items could have changed */ + schedule_update_status (view); - nautilus_profile_end (NULL); + nautilus_profile_end (NULL); } static void @@ -3951,52 +4210,53 @@ files_changed_callback (NautilusDirectory *directory, GList *files, gpointer callback_data) { - NautilusFilesView *view; - GtkWindow *window; - char *uri; + NautilusFilesView *view; + GtkWindow *window; + char *uri; - view = NAUTILUS_FILES_VIEW (callback_data); + view = NAUTILUS_FILES_VIEW (callback_data); - window = nautilus_files_view_get_containing_window (view); - uri = nautilus_files_view_get_uri (view); - DEBUG_FILES (files, "Files changed in window %p: %s", - window, uri ? uri : "(no directory)"); - g_free (uri); + window = nautilus_files_view_get_containing_window (view); + uri = nautilus_files_view_get_uri (view); + DEBUG_FILES (files, "Files changed in window %p: %s", + window, uri ? uri : "(no directory)"); + g_free (uri); - schedule_changes (view); + schedule_changes (view); - queue_pending_files (view, directory, files, &view->details->new_changed_files); + queue_pending_files (view, directory, files, &view->details->new_changed_files); - /* The free space or the number of items could have changed */ - schedule_update_status (view); + /* The free space or the number of items could have changed */ + schedule_update_status (view); - /* A change in MIME type could affect the Open with menu, for - * one thing, so we need to update menus when files change. - */ - schedule_update_context_menus (view); + /* A change in MIME type could affect the Open with menu, for + * one thing, so we need to update menus when files change. + */ + schedule_update_context_menus (view); } static void done_loading_callback (NautilusDirectory *directory, gpointer callback_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (callback_data); + view = NAUTILUS_FILES_VIEW (callback_data); - nautilus_profile_start (NULL); - process_new_files (view); - if (g_hash_table_size (view->details->non_ready_files) == 0) { - /* Unschedule a pending update and schedule a new one with the minimal - * update interval. This gives the view a short chance at gathering the - * (cached) deep counts. - */ - unschedule_display_of_pending_files (view); - schedule_timeout_display_of_pending_files (view, UPDATE_INTERVAL_MIN); + nautilus_profile_start (NULL); + process_new_files (view); + if (g_hash_table_size (view->details->non_ready_files) == 0) + { + /* Unschedule a pending update and schedule a new one with the minimal + * update interval. This gives the view a short chance at gathering the + * (cached) deep counts. + */ + unschedule_display_of_pending_files (view); + schedule_timeout_display_of_pending_files (view, UPDATE_INTERVAL_MIN); - remove_loading_floating_bar (view); - } - nautilus_profile_end (NULL); + remove_loading_floating_bar (view); + } + nautilus_profile_end (NULL); } static void @@ -4004,75 +4264,75 @@ load_error_callback (NautilusDirectory *directory, GError *error, gpointer callback_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (callback_data); + view = NAUTILUS_FILES_VIEW (callback_data); - /* FIXME: By doing a stop, we discard some pending files. Is - * that OK? - */ - nautilus_files_view_stop_loading (view); + /* FIXME: By doing a stop, we discard some pending files. Is + * that OK? + */ + nautilus_files_view_stop_loading (view); - nautilus_report_error_loading_directory - (nautilus_files_view_get_directory_as_file (view), - error, - nautilus_files_view_get_containing_window (view)); + nautilus_report_error_loading_directory + (nautilus_files_view_get_directory_as_file (view), + error, + nautilus_files_view_get_containing_window (view)); } void nautilus_files_view_add_subdirectory (NautilusFilesView *view, NautilusDirectory *directory) { - NautilusFileAttributes attributes; + NautilusFileAttributes attributes; - g_assert (!g_list_find (view->details->subdirectory_list, directory)); + g_assert (!g_list_find (view->details->subdirectory_list, directory)); - nautilus_directory_ref (directory); + nautilus_directory_ref (directory); - attributes = - NAUTILUS_FILE_ATTRIBUTES_FOR_ICON | - NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT | - NAUTILUS_FILE_ATTRIBUTE_INFO | - NAUTILUS_FILE_ATTRIBUTE_LINK_INFO | - NAUTILUS_FILE_ATTRIBUTE_MOUNT | - NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO; - - nautilus_directory_file_monitor_add (directory, - &view->details->model, - view->details->show_hidden_files, - attributes, - files_added_callback, view); - - g_signal_connect - (directory, "files-added", - G_CALLBACK (files_added_callback), view); - g_signal_connect - (directory, "files-changed", - G_CALLBACK (files_changed_callback), view); - - view->details->subdirectory_list = g_list_prepend ( - view->details->subdirectory_list, directory); + attributes = + NAUTILUS_FILE_ATTRIBUTES_FOR_ICON | + NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT | + NAUTILUS_FILE_ATTRIBUTE_INFO | + NAUTILUS_FILE_ATTRIBUTE_LINK_INFO | + NAUTILUS_FILE_ATTRIBUTE_MOUNT | + NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO; + + nautilus_directory_file_monitor_add (directory, + &view->details->model, + view->details->show_hidden_files, + attributes, + files_added_callback, view); + + g_signal_connect + (directory, "files-added", + G_CALLBACK (files_added_callback), view); + g_signal_connect + (directory, "files-changed", + G_CALLBACK (files_changed_callback), view); + + view->details->subdirectory_list = g_list_prepend ( + view->details->subdirectory_list, directory); } void nautilus_files_view_remove_subdirectory (NautilusFilesView *view, NautilusDirectory *directory) { - g_assert (g_list_find (view->details->subdirectory_list, directory)); + g_assert (g_list_find (view->details->subdirectory_list, directory)); - view->details->subdirectory_list = g_list_remove ( - view->details->subdirectory_list, directory); + view->details->subdirectory_list = g_list_remove ( + view->details->subdirectory_list, directory); - g_signal_handlers_disconnect_by_func (directory, - G_CALLBACK (files_added_callback), - view); - g_signal_handlers_disconnect_by_func (directory, - G_CALLBACK (files_changed_callback), - view); + g_signal_handlers_disconnect_by_func (directory, + G_CALLBACK (files_added_callback), + view); + g_signal_handlers_disconnect_by_func (directory, + G_CALLBACK (files_changed_callback), + view); - nautilus_directory_file_monitor_remove (directory, &view->details->model); + nautilus_directory_file_monitor_remove (directory, &view->details->model); - nautilus_directory_unref (directory); + nautilus_directory_unref (directory); } /** @@ -4085,9 +4345,9 @@ nautilus_files_view_remove_subdirectory (NautilusFilesView *view, gboolean nautilus_files_view_get_loading (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); - return view->details->loading; + return view->details->loading; } /** @@ -4102,25 +4362,25 @@ nautilus_files_view_get_loading (NautilusFilesView *view) NautilusDirectory * nautilus_files_view_get_model (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - return view->details->model; + return view->details->model; } -GtkWidget* +GtkWidget * nautilus_files_view_get_content_widget (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - return view->details->scrolled_window; + return view->details->scrolled_window; } GdkAtom nautilus_files_view_get_copied_files_atom (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), GDK_NONE); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), GDK_NONE); - return copied_files_atom; + return copied_files_atom; } static void @@ -4128,39 +4388,43 @@ offset_drop_points (GArray *relative_item_points, int x_offset, int y_offset) { - guint index; + guint index; - if (relative_item_points == NULL) { - return; - } + if (relative_item_points == NULL) + { + return; + } - for (index = 0; index < relative_item_points->len; index++) { - g_array_index (relative_item_points, GdkPoint, index).x += x_offset; - g_array_index (relative_item_points, GdkPoint, index).y += y_offset; - } + for (index = 0; index < relative_item_points->len; index++) + { + g_array_index (relative_item_points, GdkPoint, index).x += x_offset; + g_array_index (relative_item_points, GdkPoint, index).y += y_offset; + } } static gboolean nautilus_files_view_special_link_in_selection (NautilusFilesView *view, GList *selection) { - gboolean saw_link; - GList *node; - NautilusFile *file; + gboolean saw_link; + GList *node; + NautilusFile *file; - saw_link = FALSE; + saw_link = FALSE; - for (node = selection; node != NULL; node = node->next) { - file = NAUTILUS_FILE (node->data); + for (node = selection; node != NULL; node = node->next) + { + file = NAUTILUS_FILE (node->data); - saw_link = nautilus_file_is_special_link (file); + saw_link = nautilus_file_is_special_link (file); - if (saw_link) { - break; - } + if (saw_link) + { + break; } + } - return saw_link; + return saw_link; } /* desktop_or_home_dir_in_selection @@ -4171,25 +4435,27 @@ nautilus_files_view_special_link_in_selection (NautilusFilesView *view, static gboolean desktop_or_home_dir_in_selection (GList *selection) { - gboolean saw_desktop_or_home_dir; - GList *node; - NautilusFile *file; + gboolean saw_desktop_or_home_dir; + GList *node; + NautilusFile *file; - saw_desktop_or_home_dir = FALSE; + saw_desktop_or_home_dir = FALSE; - for (node = selection; node != NULL; node = node->next) { - file = NAUTILUS_FILE (node->data); + for (node = selection; node != NULL; node = node->next) + { + file = NAUTILUS_FILE (node->data); - saw_desktop_or_home_dir = - nautilus_file_is_home (file) - || nautilus_file_is_desktop_directory (file); + saw_desktop_or_home_dir = + nautilus_file_is_home (file) + || nautilus_file_is_desktop_directory (file); - if (saw_desktop_or_home_dir) { - break; - } + if (saw_desktop_or_home_dir) + { + break; } + } - return saw_desktop_or_home_dir; + return saw_desktop_or_home_dir; } static void @@ -4197,9 +4463,10 @@ trash_or_delete_done_cb (GHashTable *debuting_uris, gboolean user_cancel, NautilusFilesView *view) { - if (user_cancel) { - view->details->selection_was_removed = FALSE; - } + if (user_cancel) + { + view->details->selection_was_removed = FALSE; + } } static void @@ -4207,133 +4474,139 @@ trash_or_delete_files (GtkWindow *parent_window, const GList *files, NautilusFilesView *view) { - GList *locations; - const GList *node; + GList *locations; + const GList *node; - locations = NULL; - for (node = files; node != NULL; node = node->next) { - locations = g_list_prepend (locations, - nautilus_file_get_location ((NautilusFile *) node->data)); - } + locations = NULL; + for (node = files; node != NULL; node = node->next) + { + locations = g_list_prepend (locations, + nautilus_file_get_location ((NautilusFile *) node->data)); + } - locations = g_list_reverse (locations); + locations = g_list_reverse (locations); - nautilus_file_operations_trash_or_delete (locations, - parent_window, - (NautilusDeleteCallback) trash_or_delete_done_cb, - view); - g_list_free_full (locations, g_object_unref); + nautilus_file_operations_trash_or_delete (locations, + parent_window, + (NautilusDeleteCallback) trash_or_delete_done_cb, + view); + g_list_free_full (locations, g_object_unref); } static void open_one_in_new_window (gpointer data, gpointer callback_data) { - g_assert (NAUTILUS_IS_FILE (data)); - g_assert (NAUTILUS_IS_FILES_VIEW (callback_data)); + g_assert (NAUTILUS_IS_FILE (data)); + g_assert (NAUTILUS_IS_FILES_VIEW (callback_data)); - nautilus_files_view_activate_file (NAUTILUS_FILES_VIEW (callback_data), - NAUTILUS_FILE (data), - NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW); + nautilus_files_view_activate_file (NAUTILUS_FILES_VIEW (callback_data), + NAUTILUS_FILE (data), + NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW); } static void update_context_menu_position_from_event (NautilusFilesView *view, GdkEventButton *event) { - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - if (event != NULL) { - view->details->context_menu_position.x = event->x; - view->details->context_menu_position.y = event->y; - } else { - view->details->context_menu_position.x = -1; - view->details->context_menu_position.y = -1; - } + if (event != NULL) + { + view->details->context_menu_position.x = event->x; + view->details->context_menu_position.y = event->y; + } + else + { + view->details->context_menu_position.x = -1; + view->details->context_menu_position.y = -1; + } } NautilusFile * nautilus_files_view_get_directory_as_file (NautilusFilesView *view) { - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - return view->details->directory_as_file; + return view->details->directory_as_file; } static GdkPixbuf * get_menu_icon_for_file (NautilusFile *file, GtkWidget *widget) { - NautilusIconInfo *info; - GdkPixbuf *pixbuf; - int size, scale; + NautilusIconInfo *info; + GdkPixbuf *pixbuf; + int size, scale; - size = nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_MENU); - scale = gtk_widget_get_scale_factor (widget); + size = nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_MENU); + scale = gtk_widget_get_scale_factor (widget); - info = nautilus_file_get_icon (file, size, scale, 0); - pixbuf = nautilus_icon_info_get_pixbuf_nodefault_at_size (info, size); - g_object_unref (info); + info = nautilus_file_get_icon (file, size, scale, 0); + pixbuf = nautilus_icon_info_get_pixbuf_nodefault_at_size (info, size); + g_object_unref (info); - return pixbuf; + return pixbuf; } static GList * get_extension_selection_menu_items (NautilusFilesView *view) { - NautilusWindow *window; - GList *items; - GList *providers; - GList *l; - GList *selection; + NautilusWindow *window; + GList *items; + GList *providers; + GList *l; + GList *selection; - window = nautilus_files_view_get_window (view); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - providers = nautilus_module_get_extensions_for_type (NAUTILUS_TYPE_MENU_PROVIDER); - items = NULL; - - for (l = providers; l != NULL; l = l->next) { - NautilusMenuProvider *provider; - GList *file_items; - - provider = NAUTILUS_MENU_PROVIDER (l->data); - file_items = nautilus_menu_provider_get_file_items (provider, - GTK_WIDGET (window), - selection); - items = g_list_concat (items, file_items); - } + window = nautilus_files_view_get_window (view); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + providers = nautilus_module_get_extensions_for_type (NAUTILUS_TYPE_MENU_PROVIDER); + items = NULL; - nautilus_module_extension_list_free (providers); + for (l = providers; l != NULL; l = l->next) + { + NautilusMenuProvider *provider; + GList *file_items; - return items; + provider = NAUTILUS_MENU_PROVIDER (l->data); + file_items = nautilus_menu_provider_get_file_items (provider, + GTK_WIDGET (window), + selection); + items = g_list_concat (items, file_items); + } + + nautilus_module_extension_list_free (providers); + + return items; } static GList * get_extension_background_menu_items (NautilusFilesView *view) { - NautilusWindow *window; - GList *items; - GList *providers; - GList *l; + NautilusWindow *window; + GList *items; + GList *providers; + GList *l; - window = nautilus_files_view_get_window (view); - providers = nautilus_module_get_extensions_for_type (NAUTILUS_TYPE_MENU_PROVIDER); - items = NULL; + window = nautilus_files_view_get_window (view); + providers = nautilus_module_get_extensions_for_type (NAUTILUS_TYPE_MENU_PROVIDER); + items = NULL; - for (l = providers; l != NULL; l = l->next) { - NautilusMenuProvider *provider; - GList *file_items; + for (l = providers; l != NULL; l = l->next) + { + NautilusMenuProvider *provider; + GList *file_items; - provider = NAUTILUS_MENU_PROVIDER (l->data); - file_items = nautilus_menu_provider_get_background_items (provider, - GTK_WIDGET (window), - view->details->directory_as_file); - items = g_list_concat (items, file_items); - } + provider = NAUTILUS_MENU_PROVIDER (l->data); + file_items = nautilus_menu_provider_get_background_items (provider, + GTK_WIDGET (window), + view->details->directory_as_file); + items = g_list_concat (items, file_items); + } - nautilus_module_extension_list_free (providers); + nautilus_module_extension_list_free (providers); - return items; + return items; } static void @@ -4341,8 +4614,8 @@ extension_action_callback (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusMenuItem *item = user_data; - nautilus_menu_item_activate (item); + NautilusMenuItem *item = user_data; + nautilus_menu_item_activate (item); } static void @@ -4350,24 +4623,24 @@ add_extension_action (NautilusFilesView *view, NautilusMenuItem *item, const char *action_name) { - gboolean sensitive; - GSimpleAction *action; + gboolean sensitive; + GSimpleAction *action; - g_object_get (item, - "sensitive", &sensitive, - NULL); + g_object_get (item, + "sensitive", &sensitive, + NULL); - action = g_simple_action_new (action_name, NULL); - g_signal_connect_data (action, "activate", - G_CALLBACK (extension_action_callback), - g_object_ref (item), - (GClosureNotify) g_object_unref, 0); + action = g_simple_action_new (action_name, NULL); + g_signal_connect_data (action, "activate", + G_CALLBACK (extension_action_callback), + g_object_ref (item), + (GClosureNotify) g_object_unref, 0); - g_action_map_add_action (G_ACTION_MAP (view->details->view_action_group), - G_ACTION (action)); - g_simple_action_set_enabled (action, sensitive); + g_action_map_add_action (G_ACTION_MAP (view->details->view_action_group), + G_ACTION (action)); + g_simple_action_set_enabled (action, sensitive); - g_object_unref (action); + g_object_unref (action); } static GMenu * @@ -4375,60 +4648,62 @@ build_menu_for_extension_menu_items (NautilusFilesView *view, const gchar *extension_prefix, GList *menu_items) { - GList *l; - GMenu *gmenu; - gint idx = 0; + GList *l; + GMenu *gmenu; + gint idx = 0; - gmenu = g_menu_new (); + gmenu = g_menu_new (); - for (l = menu_items; l; l = l->next) { - NautilusMenuItem *item; - NautilusMenu *menu; - GMenuItem *menu_item; - char *name, *label; - char *extension_id, *prefix, *parsed_name, *detailed_action_name; + for (l = menu_items; l; l = l->next) + { + NautilusMenuItem *item; + NautilusMenu *menu; + GMenuItem *menu_item; + char *name, *label; + char *extension_id, *prefix, *parsed_name, *detailed_action_name; - item = NAUTILUS_MENU_ITEM (l->data); + item = NAUTILUS_MENU_ITEM (l->data); - g_object_get (item, - "label", &label, - "menu", &menu, - "name", &name, - NULL); + g_object_get (item, + "label", &label, + "menu", &menu, + "name", &name, + NULL); - extension_id = g_strdup_printf ("%s_%d", extension_prefix, idx); - prefix = g_strdup_printf ("extension_%s_", extension_id); - parsed_name = nautilus_escape_action_name (name, prefix); - add_extension_action (view, item, parsed_name); + extension_id = g_strdup_printf ("%s_%d", extension_prefix, idx); + prefix = g_strdup_printf ("extension_%s_", extension_id); + parsed_name = nautilus_escape_action_name (name, prefix); + add_extension_action (view, item, parsed_name); - detailed_action_name = g_strconcat ("view.", parsed_name, NULL); - menu_item = g_menu_item_new (label, detailed_action_name); + detailed_action_name = g_strconcat ("view.", parsed_name, NULL); + menu_item = g_menu_item_new (label, detailed_action_name); - if (menu != NULL) { - GList *children; - GMenu *children_menu; + if (menu != NULL) + { + GList *children; + GMenu *children_menu; - children = nautilus_menu_get_items (menu); - children_menu = build_menu_for_extension_menu_items (view, extension_id, children); - g_menu_item_set_submenu (menu_item, G_MENU_MODEL (children_menu)); + children = nautilus_menu_get_items (menu); + children_menu = build_menu_for_extension_menu_items (view, extension_id, children); + g_menu_item_set_submenu (menu_item, G_MENU_MODEL (children_menu)); - nautilus_menu_item_list_free (children); - g_object_unref (children_menu); - } + nautilus_menu_item_list_free (children); + g_object_unref (children_menu); + } - g_menu_append_item (gmenu, menu_item); - idx++; + g_menu_append_item (gmenu, menu_item); + idx++; - g_free (extension_id); - g_free (parsed_name); - g_free (prefix); - g_free (detailed_action_name); - g_free (name); - g_free (label); - g_object_unref (menu_item); - } + g_free (extension_id); + g_free (parsed_name); + g_free (prefix); + g_free (detailed_action_name); + g_free (name); + g_free (label); + g_object_unref (menu_item); + } - return gmenu; + return gmenu; } static void @@ -4437,153 +4712,166 @@ add_extension_menu_items (NautilusFilesView *view, GList *menu_items, GMenu *insertion_menu) { - GMenu *menu; + GMenu *menu; - menu = build_menu_for_extension_menu_items (view, extension_prefix, menu_items); - nautilus_gmenu_merge (insertion_menu, - menu, - "extensions", - FALSE); + menu = build_menu_for_extension_menu_items (view, extension_prefix, menu_items); + nautilus_gmenu_merge (insertion_menu, + menu, + "extensions", + FALSE); - g_object_unref (menu); + g_object_unref (menu); } static void update_extensions_menus (NautilusFilesView *view) { - GList *selection_items, *background_items; - - selection_items = get_extension_selection_menu_items (view); - if (selection_items != NULL) { - add_extension_menu_items (view, - "selection", - selection_items, - view->details->selection_menu); - nautilus_menu_item_list_free (selection_items); - } - - background_items = get_extension_background_menu_items (view); - if (background_items != NULL) { - add_extension_menu_items (view, - "background", - background_items, - view->details->background_menu); - nautilus_menu_item_list_free (background_items); - } + GList *selection_items, *background_items; + + selection_items = get_extension_selection_menu_items (view); + if (selection_items != NULL) + { + add_extension_menu_items (view, + "selection", + selection_items, + view->details->selection_menu); + nautilus_menu_item_list_free (selection_items); + } + + background_items = get_extension_background_menu_items (view); + if (background_items != NULL) + { + add_extension_menu_items (view, + "background", + background_items, + view->details->background_menu); + nautilus_menu_item_list_free (background_items); + } } static char * change_to_view_directory (NautilusFilesView *view) { - char *path; - char *old_path; + char *path; + char *old_path; - old_path = g_get_current_dir (); + old_path = g_get_current_dir (); - path = get_view_directory (view); + path = get_view_directory (view); - /* FIXME: What to do about non-local directories? */ - if (path != NULL) { - g_chdir (path); - } + /* FIXME: What to do about non-local directories? */ + if (path != NULL) + { + g_chdir (path); + } - g_free (path); + g_free (path); - return old_path; + return old_path; } static char ** get_file_names_as_parameter_array (GList *selection, NautilusDirectory *model) { - NautilusFile *file; - char **parameters; - GList *node; - GFile *file_location; - GFile *model_location; - int i; - - if (model == NULL) { - return NULL; - } + NautilusFile *file; + char **parameters; + GList *node; + GFile *file_location; + GFile *model_location; + int i; - parameters = g_new (char *, g_list_length (selection) + 1); + if (model == NULL) + { + return NULL; + } - model_location = nautilus_directory_get_location (model); + parameters = g_new (char *, g_list_length (selection) + 1); - for (node = selection, i = 0; node != NULL; node = node->next, i++) { - file = NAUTILUS_FILE (node->data); + model_location = nautilus_directory_get_location (model); - if (!nautilus_file_is_local (file)) { - parameters[i] = NULL; - g_strfreev (parameters); - return NULL; - } + for (node = selection, i = 0; node != NULL; node = node->next, i++) + { + file = NAUTILUS_FILE (node->data); - file_location = nautilus_file_get_location (NAUTILUS_FILE (node->data)); - parameters[i] = g_file_get_relative_path (model_location, file_location); - if (parameters[i] == NULL) { - parameters[i] = g_file_get_path (file_location); - } - g_object_unref (file_location); + if (!nautilus_file_is_local (file)) + { + parameters[i] = NULL; + g_strfreev (parameters); + return NULL; } - g_object_unref (model_location); + file_location = nautilus_file_get_location (NAUTILUS_FILE (node->data)); + parameters[i] = g_file_get_relative_path (model_location, file_location); + if (parameters[i] == NULL) + { + parameters[i] = g_file_get_path (file_location); + } + g_object_unref (file_location); + } + + g_object_unref (model_location); - parameters[i] = NULL; - return parameters; + parameters[i] = NULL; + return parameters; } -static char* +static char * get_file_paths_or_uris_as_newline_delimited_string (NautilusFilesView *view, GList *selection, gboolean get_paths) { - char *path; - char *uri; - char *result; - GString *expanding_string; - GList *node; - - expanding_string = g_string_new (""); - for (node = selection; node != NULL; node = node->next) { - uri = nautilus_file_get_target_uri (NAUTILUS_FILE (node->data)); - if (uri == NULL) { - continue; - } + char *path; + char *uri; + char *result; + GString *expanding_string; + GList *node; - if (get_paths) { - path = g_filename_from_uri (uri, NULL, NULL); - if (path != NULL) { - g_string_append (expanding_string, path); - g_free (path); - g_string_append (expanding_string, "\n"); - } - } else { - g_string_append (expanding_string, uri); - g_string_append (expanding_string, "\n"); - } - g_free (uri); + expanding_string = g_string_new (""); + for (node = selection; node != NULL; node = node->next) + { + uri = nautilus_file_get_target_uri (NAUTILUS_FILE (node->data)); + if (uri == NULL) + { + continue; + } + + if (get_paths) + { + path = g_filename_from_uri (uri, NULL, NULL); + if (path != NULL) + { + g_string_append (expanding_string, path); + g_free (path); + g_string_append (expanding_string, "\n"); + } + } + else + { + g_string_append (expanding_string, uri); + g_string_append (expanding_string, "\n"); } + g_free (uri); + } - result = expanding_string->str; - g_string_free (expanding_string, FALSE); + result = expanding_string->str; + g_string_free (expanding_string, FALSE); - return result; + return result; } static char * get_file_paths_as_newline_delimited_string (NautilusFilesView *view, GList *selection) { - return get_file_paths_or_uris_as_newline_delimited_string (view, selection, TRUE); + return get_file_paths_or_uris_as_newline_delimited_string (view, selection, TRUE); } static char * get_file_uris_as_newline_delimited_string (NautilusFilesView *view, GList *selection) { - return get_file_paths_or_uris_as_newline_delimited_string (view, selection, FALSE); + return get_file_paths_or_uris_as_newline_delimited_string (view, selection, FALSE); } /* returns newly allocated strings for setting the environment variables */ @@ -4594,28 +4882,32 @@ get_strings_for_environment_variables (NautilusFilesView *view, char **uris, char **uri) { - char *directory_uri; - - /* We need to check that the directory uri starts with "file:" since - * nautilus_directory_is_local returns FALSE for nfs. - */ - directory_uri = nautilus_directory_get_uri (view->details->model); - if (g_str_has_prefix (directory_uri, "file:") || - eel_uri_is_desktop (directory_uri) || - eel_uri_is_trash (directory_uri)) { - *file_paths = get_file_paths_as_newline_delimited_string (view, selected_files); - } else { - *file_paths = g_strdup (""); - } - g_free (directory_uri); - - *uris = get_file_uris_as_newline_delimited_string (view, selected_files); - - *uri = nautilus_directory_get_uri (view->details->model); - if (eel_uri_is_desktop (*uri)) { - g_free (*uri); - *uri = nautilus_get_desktop_directory_uri (); - } + char *directory_uri; + + /* We need to check that the directory uri starts with "file:" since + * nautilus_directory_is_local returns FALSE for nfs. + */ + directory_uri = nautilus_directory_get_uri (view->details->model); + if (g_str_has_prefix (directory_uri, "file:") || + eel_uri_is_desktop (directory_uri) || + eel_uri_is_trash (directory_uri)) + { + *file_paths = get_file_paths_as_newline_delimited_string (view, selected_files); + } + else + { + *file_paths = g_strdup (""); + } + g_free (directory_uri); + + *uris = get_file_uris_as_newline_delimited_string (view, selected_files); + + *uri = nautilus_directory_get_uri (view->details->model); + if (eel_uri_is_desktop (*uri)) + { + g_free (*uri); + *uri = nautilus_get_desktop_directory_uri (); + } } /* @@ -4626,37 +4918,37 @@ static void set_script_environment_variables (NautilusFilesView *view, GList *selected_files) { - char *file_paths; - char *uris; - char *uri; - char *geometry_string; + char *file_paths; + char *uris; + char *uri; + char *geometry_string; - get_strings_for_environment_variables (view, selected_files, - &file_paths, &uris, &uri); + get_strings_for_environment_variables (view, selected_files, + &file_paths, &uris, &uri); - g_setenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS", file_paths, TRUE); - g_free (file_paths); + g_setenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS", file_paths, TRUE); + g_free (file_paths); - g_setenv ("NAUTILUS_SCRIPT_SELECTED_URIS", uris, TRUE); - g_free (uris); + g_setenv ("NAUTILUS_SCRIPT_SELECTED_URIS", uris, TRUE); + g_free (uris); - g_setenv ("NAUTILUS_SCRIPT_CURRENT_URI", uri, TRUE); - g_free (uri); + g_setenv ("NAUTILUS_SCRIPT_CURRENT_URI", uri, TRUE); + g_free (uri); - geometry_string = eel_gtk_window_get_geometry_string - (GTK_WINDOW (nautilus_files_view_get_containing_window (view))); - g_setenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY", geometry_string, TRUE); - g_free (geometry_string); + geometry_string = eel_gtk_window_get_geometry_string + (GTK_WINDOW (nautilus_files_view_get_containing_window (view))); + g_setenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY", geometry_string, TRUE); + g_free (geometry_string); } /* Unset all the special script environment variables. */ static void unset_script_environment_variables (void) { - g_unsetenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS"); - g_unsetenv ("NAUTILUS_SCRIPT_SELECTED_URIS"); - g_unsetenv ("NAUTILUS_SCRIPT_CURRENT_URI"); - g_unsetenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY"); + g_unsetenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS"); + g_unsetenv ("NAUTILUS_SCRIPT_SELECTED_URIS"); + g_unsetenv ("NAUTILUS_SCRIPT_CURRENT_URI"); + g_unsetenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY"); } static void @@ -4664,47 +4956,47 @@ run_script (GSimpleAction *action, GVariant *state, gpointer user_data) { - ScriptLaunchParameters *launch_parameters; - GdkScreen *screen; - GList *selected_files; - char *file_uri; - char *local_file_path; - char *quoted_path; - char *old_working_dir; - char **parameters; + ScriptLaunchParameters *launch_parameters; + GdkScreen *screen; + GList *selected_files; + char *file_uri; + char *local_file_path; + char *quoted_path; + char *old_working_dir; + char **parameters; - launch_parameters = (ScriptLaunchParameters *) user_data; + launch_parameters = (ScriptLaunchParameters *) user_data; - file_uri = nautilus_file_get_uri (launch_parameters->file); - local_file_path = g_filename_from_uri (file_uri, NULL, NULL); - g_assert (local_file_path != NULL); - g_free (file_uri); + file_uri = nautilus_file_get_uri (launch_parameters->file); + local_file_path = g_filename_from_uri (file_uri, NULL, NULL); + g_assert (local_file_path != NULL); + g_free (file_uri); - quoted_path = g_shell_quote (local_file_path); - g_free (local_file_path); + quoted_path = g_shell_quote (local_file_path); + g_free (local_file_path); - old_working_dir = change_to_view_directory (launch_parameters->directory_view); + old_working_dir = change_to_view_directory (launch_parameters->directory_view); - selected_files = nautilus_view_get_selection (NAUTILUS_VIEW (launch_parameters->directory_view)); - set_script_environment_variables (launch_parameters->directory_view, selected_files); + selected_files = nautilus_view_get_selection (NAUTILUS_VIEW (launch_parameters->directory_view)); + set_script_environment_variables (launch_parameters->directory_view, selected_files); - parameters = get_file_names_as_parameter_array (selected_files, - launch_parameters->directory_view->details->model); + parameters = get_file_names_as_parameter_array (selected_files, + launch_parameters->directory_view->details->model); - screen = gtk_widget_get_screen (GTK_WIDGET (launch_parameters->directory_view)); + screen = gtk_widget_get_screen (GTK_WIDGET (launch_parameters->directory_view)); - DEBUG ("run_script, script_path=“%s” (omitting script parameters)", - local_file_path); + DEBUG ("run_script, script_path=“%s” (omitting script parameters)", + local_file_path); - nautilus_launch_application_from_command_array (screen, quoted_path, FALSE, - (const char * const *) parameters); - g_strfreev (parameters); + nautilus_launch_application_from_command_array (screen, quoted_path, FALSE, + (const char * const *) parameters); + g_strfreev (parameters); - nautilus_file_list_free (selected_files); - unset_script_environment_variables (); - g_chdir (old_working_dir); - g_free (old_working_dir); - g_free (quoted_path); + nautilus_file_list_free (selected_files); + unset_script_environment_variables (); + g_chdir (old_working_dir); + g_free (old_working_dir); + g_free (quoted_path); } static void @@ -4712,178 +5004,196 @@ add_script_to_scripts_menus (NautilusFilesView *view, NautilusFile *file, GMenu *menu) { - gchar *name; - GdkPixbuf *mimetype_icon; - gchar *action_name, *detailed_action_name; - ScriptLaunchParameters *launch_parameters; - GAction *action; - GMenuItem *menu_item; - const gchar *shortcut; + gchar *name; + GdkPixbuf *mimetype_icon; + gchar *action_name, *detailed_action_name; + ScriptLaunchParameters *launch_parameters; + GAction *action; + GMenuItem *menu_item; + const gchar *shortcut; - launch_parameters = script_launch_parameters_new (file, view); + launch_parameters = script_launch_parameters_new (file, view); - name = nautilus_file_get_display_name (file); - action_name = nautilus_escape_action_name (name, "script_"); + name = nautilus_file_get_display_name (file); + action_name = nautilus_escape_action_name (name, "script_"); - action = G_ACTION (g_simple_action_new (action_name, NULL)); + action = G_ACTION (g_simple_action_new (action_name, NULL)); - g_signal_connect_data (action, "activate", - G_CALLBACK (run_script), - launch_parameters, - (GClosureNotify)script_launch_parameters_free, 0); + g_signal_connect_data (action, "activate", + G_CALLBACK (run_script), + launch_parameters, + (GClosureNotify) script_launch_parameters_free, 0); - g_action_map_add_action (G_ACTION_MAP (view->details->view_action_group), action); + g_action_map_add_action (G_ACTION_MAP (view->details->view_action_group), action); - g_object_unref (action); + g_object_unref (action); - detailed_action_name = g_strconcat ("view.", action_name, NULL); - menu_item = g_menu_item_new (name, detailed_action_name); + detailed_action_name = g_strconcat ("view.", action_name, NULL); + menu_item = g_menu_item_new (name, detailed_action_name); - mimetype_icon = get_menu_icon_for_file (file, GTK_WIDGET (view)); - if (mimetype_icon != NULL) { - g_menu_item_set_icon (menu_item, G_ICON (mimetype_icon)); - g_object_unref (mimetype_icon); - } + mimetype_icon = get_menu_icon_for_file (file, GTK_WIDGET (view)); + if (mimetype_icon != NULL) + { + g_menu_item_set_icon (menu_item, G_ICON (mimetype_icon)); + g_object_unref (mimetype_icon); + } - g_menu_append_item (menu, menu_item); + g_menu_append_item (menu, menu_item); - if ((shortcut = g_hash_table_lookup (script_accels, name))) { - nautilus_application_set_accelerator (g_application_get_default(), - detailed_action_name, shortcut); - } + if ((shortcut = g_hash_table_lookup (script_accels, name))) + { + nautilus_application_set_accelerator (g_application_get_default (), + detailed_action_name, shortcut); + } - g_free (name); - g_free (action_name); - g_free (detailed_action_name); - g_object_unref (menu_item); + g_free (name); + g_free (action_name); + g_free (detailed_action_name); + g_object_unref (menu_item); } static gboolean directory_belongs_in_scripts_menu (const char *uri) { - int num_levels; - int i; + int num_levels; + int i; - if (!g_str_has_prefix (uri, scripts_directory_uri)) { - return FALSE; - } + if (!g_str_has_prefix (uri, scripts_directory_uri)) + { + return FALSE; + } - num_levels = 0; - for (i = scripts_directory_uri_length; uri[i] != '\0'; i++) { - if (uri[i] == '/') { - num_levels++; - } + num_levels = 0; + for (i = scripts_directory_uri_length; uri[i] != '\0'; i++) + { + if (uri[i] == '/') + { + num_levels++; } + } - if (num_levels > MAX_MENU_LEVELS) { - return FALSE; - } + if (num_levels > MAX_MENU_LEVELS) + { + return FALSE; + } - return TRUE; + return TRUE; } /* Expected format: accel script_name */ static void nautilus_load_custom_accel_for_scripts (void) { - gchar *path, *contents; - gchar **lines, **result; - GError *error = NULL; - const int max_len = 100; - int i; + gchar *path, *contents; + gchar **lines, **result; + GError *error = NULL; + const int max_len = 100; + int i; - path = g_build_filename (g_get_user_config_dir (), SHORTCUTS_PATH, NULL); + path = g_build_filename (g_get_user_config_dir (), SHORTCUTS_PATH, NULL); - if (g_file_get_contents (path, &contents, NULL, &error)) { - lines = g_strsplit (contents, "\n", -1); - for (i = 0; lines[i] && (strstr (lines[i], " ") > 0); i++) { - result = g_strsplit (lines[i], " ", 2); - g_hash_table_insert (script_accels, - g_strndup (result[1], max_len), - g_strndup (result[0], max_len)); - g_strfreev (result); - } + if (g_file_get_contents (path, &contents, NULL, &error)) + { + lines = g_strsplit (contents, "\n", -1); + for (i = 0; lines[i] && (strstr (lines[i], " ") > 0); i++) + { + result = g_strsplit (lines[i], " ", 2); + g_hash_table_insert (script_accels, + g_strndup (result[1], max_len), + g_strndup (result[0], max_len)); + g_strfreev (result); + } - g_free (contents); - g_strfreev (lines); - } else { - DEBUG ("Unable to open '%s', error message: %s", path, error->message); - g_clear_error (&error); - } + g_free (contents); + g_strfreev (lines); + } + else + { + DEBUG ("Unable to open '%s', error message: %s", path, error->message); + g_clear_error (&error); + } - g_free (path); + g_free (path); } static GMenu * update_directory_in_scripts_menu (NautilusFilesView *view, NautilusDirectory *directory) { - GList *file_list, *filtered, *node; - GMenu *menu, *children_menu; - GMenuItem *menu_item; - gboolean any_scripts; - NautilusFile *file; - NautilusDirectory *dir; - char *uri; - gchar *file_name; - int num; - - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL); - - if (script_accels == NULL) { - script_accels = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, g_free); - nautilus_load_custom_accel_for_scripts (); - } - - file_list = nautilus_directory_get_file_list (directory); - filtered = nautilus_file_list_filter_hidden (file_list, FALSE); - nautilus_file_list_free (file_list); - menu = g_menu_new (); - - filtered = nautilus_file_list_sort_by_display_name (filtered); - - num = 0; - any_scripts = FALSE; - for (node = filtered; num < TEMPLATE_LIMIT && node != NULL; node = node->next, num++) { - file = node->data; - if (nautilus_file_is_directory (file)) { - uri = nautilus_file_get_uri (file); - if (directory_belongs_in_scripts_menu (uri)) { - dir = nautilus_directory_get_by_uri (uri); - add_directory_to_scripts_directory_list (view, dir); - - children_menu = update_directory_in_scripts_menu (view, dir); - - if (children_menu != NULL) { - file_name = nautilus_file_get_display_name (file); - menu_item = g_menu_item_new_submenu (file_name, - G_MENU_MODEL (children_menu)); - g_menu_append_item (menu, menu_item); - any_scripts = TRUE; - g_object_unref (menu_item); - g_object_unref (children_menu); - g_free (file_name); - } - - nautilus_directory_unref (dir); - } - g_free (uri); - } else if (nautilus_file_is_launchable (file)) { - add_script_to_scripts_menus (view, file, menu); - any_scripts = TRUE; + GList *file_list, *filtered, *node; + GMenu *menu, *children_menu; + GMenuItem *menu_item; + gboolean any_scripts; + NautilusFile *file; + NautilusDirectory *dir; + char *uri; + gchar *file_name; + int num; + + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL); + + if (script_accels == NULL) + { + script_accels = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, g_free); + nautilus_load_custom_accel_for_scripts (); + } + + file_list = nautilus_directory_get_file_list (directory); + filtered = nautilus_file_list_filter_hidden (file_list, FALSE); + nautilus_file_list_free (file_list); + menu = g_menu_new (); + + filtered = nautilus_file_list_sort_by_display_name (filtered); + + num = 0; + any_scripts = FALSE; + for (node = filtered; num < TEMPLATE_LIMIT && node != NULL; node = node->next, num++) + { + file = node->data; + if (nautilus_file_is_directory (file)) + { + uri = nautilus_file_get_uri (file); + if (directory_belongs_in_scripts_menu (uri)) + { + dir = nautilus_directory_get_by_uri (uri); + add_directory_to_scripts_directory_list (view, dir); + + children_menu = update_directory_in_scripts_menu (view, dir); + + if (children_menu != NULL) + { + file_name = nautilus_file_get_display_name (file); + menu_item = g_menu_item_new_submenu (file_name, + G_MENU_MODEL (children_menu)); + g_menu_append_item (menu, menu_item); + any_scripts = TRUE; + g_object_unref (menu_item); + g_object_unref (children_menu); + g_free (file_name); } + + nautilus_directory_unref (dir); + } + g_free (uri); + } + else if (nautilus_file_is_launchable (file)) + { + add_script_to_scripts_menus (view, file, menu); + any_scripts = TRUE; } + } - nautilus_file_list_free (filtered); + nautilus_file_list_free (filtered); - if (!any_scripts) { - g_object_unref (menu); - menu = NULL; - } + if (!any_scripts) + { + g_object_unref (menu); + menu = NULL; + } - return menu; + return menu; } @@ -4891,38 +5201,41 @@ update_directory_in_scripts_menu (NautilusFilesView *view, static void update_scripts_menu (NautilusFilesView *view) { - GList *sorted_copy, *node; - NautilusDirectory *directory; - GMenu *submenu; - char *uri; + GList *sorted_copy, *node; + NautilusDirectory *directory; + GMenu *submenu; + char *uri; - sorted_copy = nautilus_directory_list_sort_by_uri - (nautilus_directory_list_copy (view->details->scripts_directory_list)); + sorted_copy = nautilus_directory_list_sort_by_uri + (nautilus_directory_list_copy (view->details->scripts_directory_list)); - for (node = sorted_copy; node != NULL; node = node->next) { - directory = node->data; + for (node = sorted_copy; node != NULL; node = node->next) + { + directory = node->data; - uri = nautilus_directory_get_uri (directory); - if (!directory_belongs_in_scripts_menu (uri)) { - remove_directory_from_scripts_directory_list (view, directory); - } - g_free (uri); - } - nautilus_directory_list_free (sorted_copy); - - directory = nautilus_directory_get_by_uri (scripts_directory_uri); - submenu = update_directory_in_scripts_menu (view, directory); - if (submenu != NULL) { - nautilus_gmenu_merge (view->details->selection_menu, - submenu, - "scripts-submenu", - TRUE); - g_object_unref (submenu); + uri = nautilus_directory_get_uri (directory); + if (!directory_belongs_in_scripts_menu (uri)) + { + remove_directory_from_scripts_directory_list (view, directory); } + g_free (uri); + } + nautilus_directory_list_free (sorted_copy); - nautilus_directory_unref (directory); + directory = nautilus_directory_get_by_uri (scripts_directory_uri); + submenu = update_directory_in_scripts_menu (view, directory); + if (submenu != NULL) + { + nautilus_gmenu_merge (view->details->selection_menu, + submenu, + "scripts-submenu", + TRUE); + g_object_unref (submenu); + } - view->details->scripts_present = submenu != NULL; + nautilus_directory_unref (directory); + + view->details->scripts_present = submenu != NULL; } static void @@ -4930,12 +5243,11 @@ create_template (GSimpleAction *action, GVariant *state, gpointer user_data) { + CreateTemplateParameters *parameters; - CreateTemplateParameters *parameters; - - parameters = user_data; + parameters = user_data; - nautilus_files_view_new_file (parameters->directory_view, NULL, parameters->file); + nautilus_files_view_new_file (parameters->directory_view, NULL, parameters->file); } static void @@ -4943,162 +5255,177 @@ add_template_to_templates_menus (NautilusFilesView *view, NautilusFile *file, GMenu *menu) { - char *tmp, *uri, *name; - GdkPixbuf *mimetype_icon; - char *action_name, *detailed_action_name; - CreateTemplateParameters *parameters; - GAction *action; - GMenuItem *menu_item; + char *tmp, *uri, *name; + GdkPixbuf *mimetype_icon; + char *action_name, *detailed_action_name; + CreateTemplateParameters *parameters; + GAction *action; + GMenuItem *menu_item; - tmp = nautilus_file_get_display_name (file); - name = eel_filename_strip_extension (tmp); - g_free (tmp); + tmp = nautilus_file_get_display_name (file); + name = eel_filename_strip_extension (tmp); + g_free (tmp); - uri = nautilus_file_get_uri (file); - action_name = nautilus_escape_action_name (uri, "template_"); - action = G_ACTION (g_simple_action_new (action_name, NULL)); - parameters = create_template_parameters_new (file, view); + uri = nautilus_file_get_uri (file); + action_name = nautilus_escape_action_name (uri, "template_"); + action = G_ACTION (g_simple_action_new (action_name, NULL)); + parameters = create_template_parameters_new (file, view); - g_signal_connect_data (action, "activate", - G_CALLBACK (create_template), - parameters, - (GClosureNotify)create_templates_parameters_free, 0); + g_signal_connect_data (action, "activate", + G_CALLBACK (create_template), + parameters, + (GClosureNotify) create_templates_parameters_free, 0); - g_action_map_add_action (G_ACTION_MAP (view->details->view_action_group), action); + g_action_map_add_action (G_ACTION_MAP (view->details->view_action_group), action); - detailed_action_name = g_strconcat ("view.", action_name, NULL); - menu_item = g_menu_item_new (name, detailed_action_name); + detailed_action_name = g_strconcat ("view.", action_name, NULL); + menu_item = g_menu_item_new (name, detailed_action_name); - mimetype_icon = get_menu_icon_for_file (file, GTK_WIDGET (view)); - if (mimetype_icon != NULL) { - g_menu_item_set_icon (menu_item, G_ICON (mimetype_icon)); - g_object_unref (mimetype_icon); - } + mimetype_icon = get_menu_icon_for_file (file, GTK_WIDGET (view)); + if (mimetype_icon != NULL) + { + g_menu_item_set_icon (menu_item, G_ICON (mimetype_icon)); + g_object_unref (mimetype_icon); + } - g_menu_append_item (menu, menu_item); + g_menu_append_item (menu, menu_item); - g_free (name); - g_free (uri); - g_free (action_name); - g_free (detailed_action_name); - g_object_unref (action); - g_object_unref (menu_item); + g_free (name); + g_free (uri); + g_free (action_name); + g_free (detailed_action_name); + g_object_unref (action); + g_object_unref (menu_item); } static void update_templates_directory (NautilusFilesView *view) { - NautilusDirectory *templates_directory; - GList *node, *next; - char *templates_uri; + NautilusDirectory *templates_directory; + GList *node, *next; + char *templates_uri; - for (node = view->details->templates_directory_list; node != NULL; node = next) { - next = node->next; - remove_directory_from_templates_directory_list (view, node->data); - } + for (node = view->details->templates_directory_list; node != NULL; node = next) + { + next = node->next; + remove_directory_from_templates_directory_list (view, node->data); + } - if (nautilus_should_use_templates_directory ()) { - templates_uri = nautilus_get_templates_directory_uri (); - templates_directory = nautilus_directory_get_by_uri (templates_uri); - g_free (templates_uri); - add_directory_to_templates_directory_list (view, templates_directory); - nautilus_directory_unref (templates_directory); - } + if (nautilus_should_use_templates_directory ()) + { + templates_uri = nautilus_get_templates_directory_uri (); + templates_directory = nautilus_directory_get_by_uri (templates_uri); + g_free (templates_uri); + add_directory_to_templates_directory_list (view, templates_directory); + nautilus_directory_unref (templates_directory); + } } static gboolean directory_belongs_in_templates_menu (const char *templates_directory_uri, const char *uri) { - int num_levels; - int i; + int num_levels; + int i; - if (templates_directory_uri == NULL) { - return FALSE; - } + if (templates_directory_uri == NULL) + { + return FALSE; + } - if (!g_str_has_prefix (uri, templates_directory_uri)) { - return FALSE; - } + if (!g_str_has_prefix (uri, templates_directory_uri)) + { + return FALSE; + } - num_levels = 0; - for (i = strlen (templates_directory_uri); uri[i] != '\0'; i++) { - if (uri[i] == '/') { - num_levels++; - } + num_levels = 0; + for (i = strlen (templates_directory_uri); uri[i] != '\0'; i++) + { + if (uri[i] == '/') + { + num_levels++; } + } - if (num_levels > MAX_MENU_LEVELS) { - return FALSE; - } + if (num_levels > MAX_MENU_LEVELS) + { + return FALSE; + } - return TRUE; + return TRUE; } static GMenu * update_directory_in_templates_menu (NautilusFilesView *view, NautilusDirectory *directory) { - GList *file_list, *filtered, *node; - GMenu *menu, *children_menu; - GMenuItem *menu_item; - gboolean any_templates; - NautilusFile *file; - NautilusDirectory *dir; - char *uri; - char *templates_directory_uri; - int num; - - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL); - - file_list = nautilus_directory_get_file_list (directory); - filtered = nautilus_file_list_filter_hidden (file_list, FALSE); - nautilus_file_list_free (file_list); - templates_directory_uri = nautilus_get_templates_directory_uri (); - menu = g_menu_new (); - - filtered = nautilus_file_list_sort_by_display_name (filtered); - - num = 0; - any_templates = FALSE; - for (node = filtered; num < TEMPLATE_LIMIT && node != NULL; node = node->next, num++) { - file = node->data; - if (nautilus_file_is_directory (file)) { - uri = nautilus_file_get_uri (file); - if (directory_belongs_in_templates_menu (templates_directory_uri, uri)) { - dir = nautilus_directory_get_by_uri (uri); - add_directory_to_templates_directory_list (view, dir); - - children_menu = update_directory_in_templates_menu (view, dir); - - if (children_menu != NULL) { - menu_item = g_menu_item_new_submenu (nautilus_file_get_display_name (file), - G_MENU_MODEL (children_menu)); - g_menu_append_item (menu, menu_item); - any_templates = TRUE; - g_object_unref (menu_item); - g_object_unref (children_menu); - } - - nautilus_directory_unref (dir); - } - g_free (uri); - } else if (nautilus_file_can_read (file)) { - add_template_to_templates_menus (view, file, menu); - any_templates = TRUE; + GList *file_list, *filtered, *node; + GMenu *menu, *children_menu; + GMenuItem *menu_item; + gboolean any_templates; + NautilusFile *file; + NautilusDirectory *dir; + char *uri; + char *templates_directory_uri; + int num; + + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL); + + file_list = nautilus_directory_get_file_list (directory); + filtered = nautilus_file_list_filter_hidden (file_list, FALSE); + nautilus_file_list_free (file_list); + templates_directory_uri = nautilus_get_templates_directory_uri (); + menu = g_menu_new (); + + filtered = nautilus_file_list_sort_by_display_name (filtered); + + num = 0; + any_templates = FALSE; + for (node = filtered; num < TEMPLATE_LIMIT && node != NULL; node = node->next, num++) + { + file = node->data; + if (nautilus_file_is_directory (file)) + { + uri = nautilus_file_get_uri (file); + if (directory_belongs_in_templates_menu (templates_directory_uri, uri)) + { + dir = nautilus_directory_get_by_uri (uri); + add_directory_to_templates_directory_list (view, dir); + + children_menu = update_directory_in_templates_menu (view, dir); + + if (children_menu != NULL) + { + menu_item = g_menu_item_new_submenu (nautilus_file_get_display_name (file), + G_MENU_MODEL (children_menu)); + g_menu_append_item (menu, menu_item); + any_templates = TRUE; + g_object_unref (menu_item); + g_object_unref (children_menu); } + + nautilus_directory_unref (dir); + } + g_free (uri); } + else if (nautilus_file_can_read (file)) + { + add_template_to_templates_menus (view, file, menu); + any_templates = TRUE; + } + } - nautilus_file_list_free (filtered); - g_free (templates_directory_uri); + nautilus_file_list_free (filtered); + g_free (templates_directory_uri); - if (!any_templates) { - g_object_unref (menu); - menu = NULL; - } + if (!any_templates) + { + g_object_unref (menu); + menu = NULL; + } - return menu; + return menu; } @@ -5106,49 +5433,55 @@ update_directory_in_templates_menu (NautilusFilesView *view, static void update_templates_menu (NautilusFilesView *view) { - GList *sorted_copy, *node; - NautilusDirectory *directory; - GMenu *submenu; - char *uri; - char *templates_directory_uri; + GList *sorted_copy, *node; + NautilusDirectory *directory; + GMenu *submenu; + char *uri; + char *templates_directory_uri; - if (nautilus_should_use_templates_directory ()) { - templates_directory_uri = nautilus_get_templates_directory_uri (); - } else { - view->details->templates_present = FALSE; - return; - } + if (nautilus_should_use_templates_directory ()) + { + templates_directory_uri = nautilus_get_templates_directory_uri (); + } + else + { + view->details->templates_present = FALSE; + return; + } - sorted_copy = nautilus_directory_list_sort_by_uri - (nautilus_directory_list_copy (view->details->templates_directory_list)); + sorted_copy = nautilus_directory_list_sort_by_uri + (nautilus_directory_list_copy (view->details->templates_directory_list)); - for (node = sorted_copy; node != NULL; node = node->next) { - directory = node->data; + for (node = sorted_copy; node != NULL; node = node->next) + { + directory = node->data; - uri = nautilus_directory_get_uri (directory); - if (!directory_belongs_in_templates_menu (templates_directory_uri, uri)) { - remove_directory_from_templates_directory_list (view, directory); - } - g_free (uri); - } - nautilus_directory_list_free (sorted_copy); - - directory = nautilus_directory_get_by_uri (templates_directory_uri); - submenu = update_directory_in_templates_menu (view, directory); - if (submenu != NULL) { - nautilus_gmenu_merge (view->details->background_menu, - submenu, - "templates-submenu", - FALSE); - g_object_unref (submenu); + uri = nautilus_directory_get_uri (directory); + if (!directory_belongs_in_templates_menu (templates_directory_uri, uri)) + { + remove_directory_from_templates_directory_list (view, directory); } + g_free (uri); + } + nautilus_directory_list_free (sorted_copy); + + directory = nautilus_directory_get_by_uri (templates_directory_uri); + submenu = update_directory_in_templates_menu (view, directory); + if (submenu != NULL) + { + nautilus_gmenu_merge (view->details->background_menu, + submenu, + "templates-submenu", + FALSE); + g_object_unref (submenu); + } - nautilus_directory_unref (directory); + nautilus_directory_unref (directory); - view->details->templates_present = submenu != NULL; + view->details->templates_present = submenu != NULL; - g_free (templates_directory_uri); + g_free (templates_directory_uri); } @@ -5157,65 +5490,68 @@ action_open_scripts_folder (GSimpleAction *action, GVariant *state, gpointer user_data) { - static GFile *location = NULL; + static GFile *location = NULL; - if (location == NULL) { - location = g_file_new_for_uri (scripts_directory_uri); - } + if (location == NULL) + { + location = g_file_new_for_uri (scripts_directory_uri); + } - nautilus_application_open_location_full (NAUTILUS_APPLICATION (g_application_get_default ()), - location, 0, NULL, NULL, NULL); + nautilus_application_open_location_full (NAUTILUS_APPLICATION (g_application_get_default ()), + location, 0, NULL, NULL, NULL); } -typedef struct _CopyCallbackData { - NautilusFilesView *view; - GtkFileChooser *chooser; - GHashTable *locations; - GList *selection; - gboolean is_move; +typedef struct _CopyCallbackData +{ + NautilusFilesView *view; + GtkFileChooser *chooser; + GHashTable *locations; + GList *selection; + gboolean is_move; } CopyCallbackData; static void copy_data_free (CopyCallbackData *data) { - nautilus_file_list_free (data->selection); - g_hash_table_destroy (data->locations); - g_free (data); + nautilus_file_list_free (data->selection); + g_hash_table_destroy (data->locations); + g_free (data); } static gboolean uri_is_parent_of_selection (GList *selection, const char *uri) { - gboolean found; - GList *l; - GFile *file; + gboolean found; + GList *l; + GFile *file; - found = FALSE; + found = FALSE; - file = g_file_new_for_uri (uri); - for (l = selection; !found && l != NULL; l = l->next) { - GFile *parent; - parent = nautilus_file_get_parent_location (l->data); - found = g_file_equal (file, parent); - g_object_unref (parent); - } - g_object_unref (file); - return found; + file = g_file_new_for_uri (uri); + for (l = selection; !found && l != NULL; l = l->next) + { + GFile *parent; + parent = nautilus_file_get_parent_location (l->data); + found = g_file_equal (file, parent); + g_object_unref (parent); + } + g_object_unref (file); + return found; } static void on_destination_dialog_folder_changed (GtkFileChooser *chooser, gpointer user_data) { - CopyCallbackData *copy_data = user_data; - char *uri; - gboolean found; + CopyCallbackData *copy_data = user_data; + char *uri; + gboolean found; - uri = gtk_file_chooser_get_current_folder_uri (chooser); - found = uri_is_parent_of_selection (copy_data->selection, uri); - gtk_dialog_set_response_sensitive (GTK_DIALOG (chooser), GTK_RESPONSE_OK, !found); - g_free (uri); + uri = gtk_file_chooser_get_current_folder_uri (chooser); + found = uri_is_parent_of_selection (copy_data->selection, uri); + gtk_dialog_set_response_sensitive (GTK_DIALOG (chooser), GTK_RESPONSE_OK, !found); + g_free (uri); } static void @@ -5223,132 +5559,143 @@ on_destination_dialog_response (GtkDialog *dialog, gint response_id, gpointer user_data) { - CopyCallbackData *copy_data = user_data; + CopyCallbackData *copy_data = user_data; - if (response_id == GTK_RESPONSE_OK) { - char *target_uri; - GList *uris, *l; + if (response_id == GTK_RESPONSE_OK) + { + char *target_uri; + GList *uris, *l; - target_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); + target_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); - uris = NULL; - for (l = copy_data->selection; l != NULL; l = l->next) { - uris = g_list_prepend (uris, - nautilus_file_get_uri ((NautilusFile *) l->data)); - } - uris = g_list_reverse (uris); + uris = NULL; + for (l = copy_data->selection; l != NULL; l = l->next) + { + uris = g_list_prepend (uris, + nautilus_file_get_uri ((NautilusFile *) l->data)); + } + uris = g_list_reverse (uris); - nautilus_files_view_move_copy_items (copy_data->view, uris, NULL, target_uri, - copy_data->is_move ? GDK_ACTION_MOVE : GDK_ACTION_COPY, - 0, 0); + nautilus_files_view_move_copy_items (copy_data->view, uris, NULL, target_uri, + copy_data->is_move ? GDK_ACTION_MOVE : GDK_ACTION_COPY, + 0, 0); - g_list_free_full (uris, g_free); - g_free (target_uri); - } + g_list_free_full (uris, g_free); + g_free (target_uri); + } - copy_data_free (copy_data); - gtk_widget_destroy (GTK_WIDGET (dialog)); + copy_data_free (copy_data); + gtk_widget_destroy (GTK_WIDGET (dialog)); } static gboolean destination_dialog_filter_cb (const GtkFileFilterInfo *filter_info, gpointer user_data) { - GList *selection = user_data; - GList *l; + GList *selection = user_data; + GList *l; - for (l = selection; l != NULL; l = l->next) { - char *uri; - uri = nautilus_file_get_uri (l->data); - if (strcmp (uri, filter_info->uri) == 0) { - g_free (uri); - return FALSE; - } - g_free (uri); + for (l = selection; l != NULL; l = l->next) + { + char *uri; + uri = nautilus_file_get_uri (l->data); + if (strcmp (uri, filter_info->uri) == 0) + { + g_free (uri); + return FALSE; } + g_free (uri); + } - return TRUE; + return TRUE; } static GList * get_selected_folders (GList *selection) { - GList *folders; - GList *l; + GList *folders; + GList *l; - folders = NULL; - for (l = selection; l != NULL; l = l->next) { - if (nautilus_file_is_directory (l->data)) - folders = g_list_prepend (folders, nautilus_file_ref (l->data)); + folders = NULL; + for (l = selection; l != NULL; l = l->next) + { + if (nautilus_file_is_directory (l->data)) + { + folders = g_list_prepend (folders, nautilus_file_ref (l->data)); } - return g_list_reverse (folders); + } + return g_list_reverse (folders); } static void copy_or_move_selection (NautilusFilesView *view, gboolean is_move) { - GtkWidget *dialog; - char *uri; - CopyCallbackData *copy_data; - GList *selection; - const gchar *title; - - if (is_move) { - title = _("Select Move Destination"); - } else { - title = _("Select Copy Destination"); - } + GtkWidget *dialog; + char *uri; + CopyCallbackData *copy_data; + GList *selection; + const gchar *title; + + if (is_move) + { + title = _("Select Move Destination"); + } + else + { + title = _("Select Copy Destination"); + } + + selection = nautilus_files_view_get_selection_for_file_transfer (view); + + dialog = gtk_file_chooser_dialog_new (title, + GTK_WINDOW (nautilus_files_view_get_window (view)), + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_Select"), GTK_RESPONSE_OK, + NULL); + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), + GTK_RESPONSE_OK); + + gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + + copy_data = g_new0 (CopyCallbackData, 1); + copy_data->view = view; + copy_data->selection = selection; + copy_data->is_move = is_move; + copy_data->chooser = GTK_FILE_CHOOSER (dialog); + copy_data->locations = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + + if (selection != NULL) + { + GtkFileFilter *filter; + GList *folders; - selection = nautilus_files_view_get_selection_for_file_transfer (view); + folders = get_selected_folders (selection); - dialog = gtk_file_chooser_dialog_new (title, - GTK_WINDOW (nautilus_files_view_get_window (view)), - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, - _("_Cancel"), GTK_RESPONSE_CANCEL, - _("_Select"), GTK_RESPONSE_OK, - NULL); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE); - - gtk_dialog_set_default_response (GTK_DIALOG (dialog), - GTK_RESPONSE_OK); - - gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - - copy_data = g_new0 (CopyCallbackData, 1); - copy_data->view = view; - copy_data->selection = selection; - copy_data->is_move = is_move; - copy_data->chooser = GTK_FILE_CHOOSER (dialog); - copy_data->locations = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - - if (selection != NULL) { - GtkFileFilter *filter; - GList *folders; - - folders = get_selected_folders (selection); - - filter = gtk_file_filter_new (); - gtk_file_filter_add_custom (filter, - GTK_FILE_FILTER_URI, - destination_dialog_filter_cb, - folders, - (GDestroyNotify)nautilus_file_list_free); - gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter); - } + filter = gtk_file_filter_new (); + gtk_file_filter_add_custom (filter, + GTK_FILE_FILTER_URI, + destination_dialog_filter_cb, + folders, + (GDestroyNotify) nautilus_file_list_free); + gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter); + } - uri = nautilus_directory_get_uri (view->details->model); - gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), uri); - g_free (uri); - g_signal_connect (dialog, "current-folder-changed", - G_CALLBACK (on_destination_dialog_folder_changed), - copy_data); - g_signal_connect (dialog, "response", - G_CALLBACK (on_destination_dialog_response), - copy_data); + uri = nautilus_directory_get_uri (view->details->model); + gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), uri); + g_free (uri); + g_signal_connect (dialog, "current-folder-changed", + G_CALLBACK (on_destination_dialog_folder_changed), + copy_data); + g_signal_connect (dialog, "response", + G_CALLBACK (on_destination_dialog_response), + copy_data); - gtk_widget_show_all (dialog); + gtk_widget_show_all (dialog); } static void @@ -5356,29 +5703,29 @@ copy_or_cut_files (NautilusFilesView *view, GList *clipboard_contents, gboolean cut) { - NautilusClipboardInfo info; - GtkTargetList *target_list; - GtkTargetEntry *targets; - int n_targets; + NautilusClipboardInfo info; + GtkTargetList *target_list; + GtkTargetEntry *targets; + int n_targets; - info.files = clipboard_contents; - info.cut = cut; + info.files = clipboard_contents; + info.cut = cut; - target_list = gtk_target_list_new (NULL, 0); - gtk_target_list_add (target_list, copied_files_atom, 0, 0); - gtk_target_list_add_uri_targets (target_list, 0); - gtk_target_list_add_text_targets (target_list, 0); + target_list = gtk_target_list_new (NULL, 0); + gtk_target_list_add (target_list, copied_files_atom, 0, 0); + gtk_target_list_add_uri_targets (target_list, 0); + gtk_target_list_add_text_targets (target_list, 0); - targets = gtk_target_table_new_from_list (target_list, &n_targets); - gtk_target_list_unref (target_list); + targets = gtk_target_table_new_from_list (target_list, &n_targets); + gtk_target_list_unref (target_list); - gtk_clipboard_set_with_data (nautilus_clipboard_get (GTK_WIDGET (view)), - targets, n_targets, - nautilus_get_clipboard_callback, nautilus_clear_clipboard_callback, - NULL); - gtk_target_table_free (targets, n_targets); + gtk_clipboard_set_with_data (nautilus_clipboard_get (GTK_WIDGET (view)), + targets, n_targets, + nautilus_get_clipboard_callback, nautilus_clear_clipboard_callback, + NULL); + gtk_target_table_free (targets, n_targets); - nautilus_clipboard_monitor_set_clipboard_info (nautilus_clipboard_monitor_get (), &info); + nautilus_clipboard_monitor_set_clipboard_info (nautilus_clipboard_monitor_get (), &info); } static void @@ -5386,14 +5733,14 @@ action_copy (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GList *selection; + NautilusFilesView *view; + GList *selection; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_files_view_get_selection_for_file_transfer (view); - copy_or_cut_files (view, selection, FALSE); - nautilus_file_list_free (selection); + selection = nautilus_files_view_get_selection_for_file_transfer (view); + copy_or_cut_files (view, selection, FALSE); + nautilus_file_list_free (selection); } static void @@ -5401,14 +5748,14 @@ action_cut (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GList *selection; + NautilusFilesView *view; + GList *selection; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_files_view_get_selection_for_file_transfer (view); - copy_or_cut_files (view, selection, TRUE); - nautilus_file_list_free (selection); + selection = nautilus_files_view_get_selection_for_file_transfer (view); + copy_or_cut_files (view, selection, TRUE); + nautilus_file_list_free (selection); } static void @@ -5416,30 +5763,31 @@ action_create_links_in_place (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GList *selection; - GList *item_uris; - GList *l; - char *destination_uri; + NautilusFilesView *view; + GList *selection; + GList *item_uris; + GList *l; + char *destination_uri; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_files_view_get_selection_for_file_transfer (view); + selection = nautilus_files_view_get_selection_for_file_transfer (view); - item_uris = NULL; - for (l = selection; l != NULL; l = l->next) { - item_uris = g_list_prepend (item_uris, nautilus_file_get_uri(l->data)); - } - item_uris = g_list_reverse (item_uris); + item_uris = NULL; + for (l = selection; l != NULL; l = l->next) + { + item_uris = g_list_prepend (item_uris, nautilus_file_get_uri (l->data)); + } + item_uris = g_list_reverse (item_uris); - destination_uri = nautilus_files_view_get_backing_uri (view); + destination_uri = nautilus_files_view_get_backing_uri (view); - nautilus_files_view_move_copy_items (view, item_uris, NULL, destination_uri, - GDK_ACTION_LINK, - 0, 0); + nautilus_files_view_move_copy_items (view, item_uris, NULL, destination_uri, + GDK_ACTION_LINK, + 0, 0); - g_list_free_full (item_uris, g_free); - nautilus_file_list_free (selection); + g_list_free_full (item_uris, g_free); + nautilus_file_list_free (selection); } static void @@ -5447,10 +5795,10 @@ action_copy_to (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (user_data); - copy_or_move_selection (view, FALSE); + view = NAUTILUS_FILES_VIEW (user_data); + copy_or_move_selection (view, FALSE); } static void @@ -5458,15 +5806,16 @@ action_move_to (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (user_data); - copy_or_move_selection (view, TRUE); + view = NAUTILUS_FILES_VIEW (user_data); + copy_or_move_selection (view, TRUE); } -typedef struct { - NautilusFilesView *view; - NautilusFile *target; +typedef struct +{ + NautilusFilesView *view; + NautilusFile *target; } PasteIntoData; static void @@ -5474,45 +5823,46 @@ paste_into_clipboard_received_callback (GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer callback_data) { - PasteIntoData *data; - NautilusFilesView *view; - char *directory_uri; + PasteIntoData *data; + NautilusFilesView *view; + char *directory_uri; - data = (PasteIntoData *) callback_data; + data = (PasteIntoData *) callback_data; - view = NAUTILUS_FILES_VIEW (data->view); + view = NAUTILUS_FILES_VIEW (data->view); - if (view->details->slot != NULL) { - directory_uri = nautilus_file_get_activation_uri (data->target); + if (view->details->slot != NULL) + { + directory_uri = nautilus_file_get_activation_uri (data->target); - paste_clipboard_data (view, selection_data, directory_uri); + paste_clipboard_data (view, selection_data, directory_uri); - g_free (directory_uri); - } + g_free (directory_uri); + } - g_object_unref (view); - nautilus_file_unref (data->target); - g_free (data); + g_object_unref (view); + nautilus_file_unref (data->target); + g_free (data); } static void paste_into (NautilusFilesView *view, NautilusFile *target) { - PasteIntoData *data; + PasteIntoData *data; - g_assert (NAUTILUS_IS_FILES_VIEW (view)); - g_assert (NAUTILUS_IS_FILE (target)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILE (target)); - data = g_new (PasteIntoData, 1); + data = g_new (PasteIntoData, 1); - data->view = g_object_ref (view); - data->target = nautilus_file_ref (target); + data->view = g_object_ref (view); + data->target = nautilus_file_ref (target); - gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)), - copied_files_atom, - paste_into_clipboard_received_callback, - data); + gtk_clipboard_request_contents (nautilus_clipboard_get (GTK_WIDGET (view)), + copied_files_atom, + paste_into_clipboard_received_callback, + data); } static void @@ -5520,89 +5870,97 @@ action_paste_files_into (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GList *selection; - - view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - if (selection != NULL) { - paste_into (view, NAUTILUS_FILE (selection->data)); - nautilus_file_list_free (selection); - } + NautilusFilesView *view; + GList *selection; + view = NAUTILUS_FILES_VIEW (user_data); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + if (selection != NULL) + { + paste_into (view, NAUTILUS_FILE (selection->data)); + nautilus_file_list_free (selection); + } } static void invoke_external_bulk_rename_utility (NautilusFilesView *view, GList *selection) { - GString *cmd; - char *parameter; - char *quoted_parameter; - char *bulk_rename_tool; - GList *walk; - NautilusFile *file; - - /* assemble command line */ - bulk_rename_tool = get_bulk_rename_tool (); - cmd = g_string_new (bulk_rename_tool); - g_free (bulk_rename_tool); - for (walk = selection; walk; walk = walk->next) { - file = walk->data; - parameter = nautilus_file_get_uri (file); - quoted_parameter = g_shell_quote (parameter); - g_free (parameter); - cmd = g_string_append (cmd, " "); - cmd = g_string_append (cmd, quoted_parameter); - g_free (quoted_parameter); - } - - /* spawning and error handling */ - nautilus_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (view)), - cmd->str, FALSE, NULL); - g_string_free (cmd, TRUE); + GString *cmd; + char *parameter; + char *quoted_parameter; + char *bulk_rename_tool; + GList *walk; + NautilusFile *file; + + /* assemble command line */ + bulk_rename_tool = get_bulk_rename_tool (); + cmd = g_string_new (bulk_rename_tool); + g_free (bulk_rename_tool); + for (walk = selection; walk; walk = walk->next) + { + file = walk->data; + parameter = nautilus_file_get_uri (file); + quoted_parameter = g_shell_quote (parameter); + g_free (parameter); + cmd = g_string_append (cmd, " "); + cmd = g_string_append (cmd, quoted_parameter); + g_free (quoted_parameter); + } + + /* spawning and error handling */ + nautilus_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (view)), + cmd->str, FALSE, NULL); + g_string_free (cmd, TRUE); } static void real_action_rename (NautilusFilesView *view) { - NautilusFile *file; - GList *selection; - GtkWidget *dialog; + NautilusFile *file; + GList *selection; + GtkWidget *dialog; - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - if (selection_not_empty_in_menu_callback (view, selection)) { - /* If there is more than one file selected, invoke a batch renamer */ - if (selection->next != NULL) { - if (have_bulk_rename_tool ()) { - invoke_external_bulk_rename_utility (view, selection); - } else { - GdkCursor *cursor; - GdkDisplay *display; - - display = gtk_widget_get_display (GTK_WIDGET (nautilus_files_view_get_window (view))); - cursor = gdk_cursor_new_from_name (display, "progress"); - gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (nautilus_files_view_get_window (view))), - cursor); - g_object_unref (cursor); - - dialog = nautilus_batch_rename_dialog_new (nautilus_files_view_get_selection (NAUTILUS_VIEW (view)), - nautilus_files_view_get_model (view), - nautilus_files_view_get_window (view)); - - gtk_widget_show (GTK_WIDGET (dialog)); - } - } else { - file = NAUTILUS_FILE (selection->data); - - nautilus_files_view_rename_file_popover_new (view, file); - } + if (selection_not_empty_in_menu_callback (view, selection)) + { + /* If there is more than one file selected, invoke a batch renamer */ + if (selection->next != NULL) + { + if (have_bulk_rename_tool ()) + { + invoke_external_bulk_rename_utility (view, selection); + } + else + { + GdkCursor *cursor; + GdkDisplay *display; + + display = gtk_widget_get_display (GTK_WIDGET (nautilus_files_view_get_window (view))); + cursor = gdk_cursor_new_from_name (display, "progress"); + gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (nautilus_files_view_get_window (view))), + cursor); + g_object_unref (cursor); + + dialog = nautilus_batch_rename_dialog_new (nautilus_files_view_get_selection (NAUTILUS_VIEW (view)), + nautilus_files_view_get_model (view), + nautilus_files_view_get_window (view)); + + gtk_widget_show (GTK_WIDGET (dialog)); + } } + else + { + file = NAUTILUS_FILE (selection->data); - nautilus_file_list_free (selection); + nautilus_files_view_rename_file_popover_new (view, file); + } + } + + nautilus_file_list_free (selection); } static void @@ -5610,76 +5968,86 @@ action_rename (GSimpleAction *action, GVariant *state, gpointer user_data) { - real_action_rename (NAUTILUS_FILES_VIEW (user_data)); + real_action_rename (NAUTILUS_FILES_VIEW (user_data)); } -typedef struct { - NautilusFilesView *view; - GHashTable *added_locations; +typedef struct +{ + NautilusFilesView *view; + GHashTable *added_locations; } ExtractData; static void extract_done (GList *outputs, gpointer user_data) { - ExtractData *data; - GList *l; - gboolean all_files_acknowledged; + ExtractData *data; + GList *l; + gboolean all_files_acknowledged; - data = user_data; + data = user_data; - if (data->view == NULL) { - goto out; - } + if (data->view == NULL) + { + goto out; + } - g_signal_handlers_disconnect_by_func (data->view, - G_CALLBACK (track_newly_added_locations), - data->added_locations); + g_signal_handlers_disconnect_by_func (data->view, + G_CALLBACK (track_newly_added_locations), + data->added_locations); - if (outputs == NULL) { - goto out; - } + if (outputs == NULL) + { + goto out; + } - all_files_acknowledged = TRUE; - for (l = outputs; l && all_files_acknowledged; l = l->next) { - all_files_acknowledged = g_hash_table_contains (data->added_locations, - l->data); - } + all_files_acknowledged = TRUE; + for (l = outputs; l && all_files_acknowledged; l = l->next) + { + all_files_acknowledged = g_hash_table_contains (data->added_locations, + l->data); + } - if (all_files_acknowledged) { - GList *selection = NULL; + if (all_files_acknowledged) + { + GList *selection = NULL; - for (l = outputs; l != NULL; l = l->next) { - selection = g_list_prepend (selection, - nautilus_file_get (l->data)); - } + for (l = outputs; l != NULL; l = l->next) + { + selection = g_list_prepend (selection, + nautilus_file_get (l->data)); + } - nautilus_files_view_set_selection (NAUTILUS_VIEW (data->view), - selection); - nautilus_files_view_reveal_selection (data->view); + nautilus_files_view_set_selection (NAUTILUS_VIEW (data->view), + selection); + nautilus_files_view_reveal_selection (data->view); - nautilus_file_list_free (selection); - } else { - for (l = outputs; l != NULL; l = l->next) { - gboolean acknowledged; + nautilus_file_list_free (selection); + } + else + { + for (l = outputs; l != NULL; l = l->next) + { + gboolean acknowledged; - acknowledged = g_hash_table_contains (data->added_locations, - l->data); + acknowledged = g_hash_table_contains (data->added_locations, + l->data); - g_hash_table_insert (data->view->details->pending_reveal, - nautilus_file_get (l->data), - GUINT_TO_POINTER (acknowledged)); - } + g_hash_table_insert (data->view->details->pending_reveal, + nautilus_file_get (l->data), + GUINT_TO_POINTER (acknowledged)); } + } out: - g_hash_table_destroy (data->added_locations); + g_hash_table_destroy (data->added_locations); - if (data->view != NULL) { - g_object_remove_weak_pointer (G_OBJECT (data->view), - (gpointer *) &data->view); - } + if (data->view != NULL) + { + g_object_remove_weak_pointer (G_OBJECT (data->view), + (gpointer *) &data->view); + } - g_free (data); + g_free (data); } static void @@ -5687,63 +6055,69 @@ extract_files (NautilusFilesView *view, GList *files, GFile *destination_directory) { - GList *locations = NULL; - GList *l; - gboolean extracting_to_current_directory; + GList *locations = NULL; + GList *l; + gboolean extracting_to_current_directory; - if (files == NULL) { - return; - } + if (files == NULL) + { + return; + } - for (l = files; l != NULL; l = l->next) { - locations = g_list_prepend (locations, - nautilus_file_get_location (l->data)); - } + for (l = files; l != NULL; l = l->next) + { + locations = g_list_prepend (locations, + nautilus_file_get_location (l->data)); + } - locations = g_list_reverse (locations); - - extracting_to_current_directory = g_file_equal (destination_directory, - nautilus_view_get_location (NAUTILUS_VIEW (view))); - - if (extracting_to_current_directory) { - ExtractData *data; - - data = g_new (ExtractData, 1); - data->view = view; - data->added_locations = g_hash_table_new_full (g_file_hash, - (GEqualFunc)g_file_equal, - g_object_unref, NULL); - - - g_object_add_weak_pointer (G_OBJECT (data->view), - (gpointer *) &data->view); - - g_signal_connect_data (view, - "add-file", - G_CALLBACK (track_newly_added_locations), - data->added_locations, - NULL, - G_CONNECT_AFTER); - - nautilus_file_operations_extract_files (locations, - destination_directory, - nautilus_files_view_get_containing_window (view), - extract_done, - data); - } else { - nautilus_file_operations_extract_files (locations, - destination_directory, - nautilus_files_view_get_containing_window (view), - NULL, - NULL); - } + locations = g_list_reverse (locations); + + extracting_to_current_directory = g_file_equal (destination_directory, + nautilus_view_get_location (NAUTILUS_VIEW (view))); + + if (extracting_to_current_directory) + { + ExtractData *data; + + data = g_new (ExtractData, 1); + data->view = view; + data->added_locations = g_hash_table_new_full (g_file_hash, + (GEqualFunc) g_file_equal, + g_object_unref, NULL); - g_list_free_full (locations, g_object_unref); + + g_object_add_weak_pointer (G_OBJECT (data->view), + (gpointer *) &data->view); + + g_signal_connect_data (view, + "add-file", + G_CALLBACK (track_newly_added_locations), + data->added_locations, + NULL, + G_CONNECT_AFTER); + + nautilus_file_operations_extract_files (locations, + destination_directory, + nautilus_files_view_get_containing_window (view), + extract_done, + data); + } + else + { + nautilus_file_operations_extract_files (locations, + destination_directory, + nautilus_files_view_get_containing_window (view), + NULL, + NULL); + } + + g_list_free_full (locations, g_object_unref); } -typedef struct { - NautilusFilesView *view; - GList *files; +typedef struct +{ + NautilusFilesView *view; + GList *files; } ExtractToData; static void @@ -5751,62 +6125,64 @@ on_extract_destination_dialog_response (GtkDialog *dialog, gint response_id, gpointer user_data) { - ExtractToData *data; + ExtractToData *data; - data = user_data; + data = user_data; - if (response_id == GTK_RESPONSE_OK) { - g_autoptr (GFile) destination_directory; + if (response_id == GTK_RESPONSE_OK) + { + g_autoptr (GFile) destination_directory; - destination_directory = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog)); + destination_directory = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog)); - extract_files (data->view, data->files, destination_directory); - } + extract_files (data->view, data->files, destination_directory); + } - gtk_widget_destroy (GTK_WIDGET (dialog)); - nautilus_file_list_free (data->files); - g_free (data); + gtk_widget_destroy (GTK_WIDGET (dialog)); + nautilus_file_list_free (data->files); + g_free (data); } static void extract_files_to_chosen_location (NautilusFilesView *view, GList *files) { - ExtractToData *data; - GtkWidget *dialog; - g_autofree char *uri = NULL; + ExtractToData *data; + GtkWidget *dialog; + g_autofree char *uri = NULL; - if (files == NULL) { - return; - } + if (files == NULL) + { + return; + } - data = g_new (ExtractToData, 1); + data = g_new (ExtractToData, 1); - dialog = gtk_file_chooser_dialog_new (_("Select Extract Destination"), - GTK_WINDOW (nautilus_files_view_get_window (view)), - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, - _("_Cancel"), GTK_RESPONSE_CANCEL, - _("_Select"), GTK_RESPONSE_OK, - NULL); - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE); + dialog = gtk_file_chooser_dialog_new (_("Select Extract Destination"), + GTK_WINDOW (nautilus_files_view_get_window (view)), + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_Select"), GTK_RESPONSE_OK, + NULL); + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), - GTK_RESPONSE_OK); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), + GTK_RESPONSE_OK); - gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - uri = nautilus_directory_get_uri (view->details->model); - gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), uri); + uri = nautilus_directory_get_uri (view->details->model); + gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), uri); - data->view = view; - data->files = nautilus_file_list_copy (files); + data->view = view; + data->files = nautilus_file_list_copy (files); - g_signal_connect (dialog, "response", - G_CALLBACK (on_extract_destination_dialog_response), - data); + g_signal_connect (dialog, "response", + G_CALLBACK (on_extract_destination_dialog_response), + data); - gtk_widget_show_all (dialog); + gtk_widget_show_all (dialog); } static void @@ -5814,17 +6190,17 @@ action_extract_here (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GList *selection; + NautilusFilesView *view; + GList *selection; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - extract_files (view, selection, - nautilus_view_get_location (NAUTILUS_VIEW (view))); + extract_files (view, selection, + nautilus_view_get_location (NAUTILUS_VIEW (view))); - nautilus_file_list_free (selection); + nautilus_file_list_free (selection); } static void @@ -5832,16 +6208,16 @@ action_extract_to (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view; - GList *selection; + NautilusFilesView *view; + GList *selection; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - extract_files_to_chosen_location (view, selection); + extract_files_to_chosen_location (view, selection); - nautilus_file_list_free (selection); + nautilus_file_list_free (selection); } static void @@ -5849,9 +6225,9 @@ action_compress (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFilesView *view = user_data; + NautilusFilesView *view = user_data; - nautilus_files_view_compress_dialog_new (view); + nautilus_files_view_compress_dialog_new (view); } @@ -5864,23 +6240,25 @@ action_compress (GSimpleAction *action, static void set_uri_as_wallpaper (const char *uri) { - GSettings *settings; + GSettings *settings; - settings = gnome_background_preferences; + settings = gnome_background_preferences; - g_settings_delay (settings); + g_settings_delay (settings); - if (uri == NULL) - uri = ""; + if (uri == NULL) + { + uri = ""; + } - g_settings_set_string (settings, BG_KEY_PICTURE_URI, uri); - g_settings_set_string (settings, BG_KEY_PRIMARY_COLOR, "#000000"); - g_settings_set_string (settings, BG_KEY_SECONDARY_COLOR, "#000000"); - g_settings_set_enum (settings, BG_KEY_COLOR_TYPE, G_DESKTOP_BACKGROUND_SHADING_SOLID); - g_settings_set_enum (settings, BG_KEY_PICTURE_PLACEMENT, G_DESKTOP_BACKGROUND_STYLE_ZOOM); + g_settings_set_string (settings, BG_KEY_PICTURE_URI, uri); + g_settings_set_string (settings, BG_KEY_PRIMARY_COLOR, "#000000"); + g_settings_set_string (settings, BG_KEY_SECONDARY_COLOR, "#000000"); + g_settings_set_enum (settings, BG_KEY_COLOR_TYPE, G_DESKTOP_BACKGROUND_SHADING_SOLID); + g_settings_set_enum (settings, BG_KEY_PICTURE_PLACEMENT, G_DESKTOP_BACKGROUND_STYLE_ZOOM); - /* Apply changes atomically. */ - g_settings_apply (settings); + /* Apply changes atomically. */ + g_settings_apply (settings); } static void @@ -5888,36 +6266,39 @@ wallpaper_copy_done_callback (GHashTable *debuting_files, gboolean success, gpointer data) { - GHashTableIter iter; - gpointer key, value; + GHashTableIter iter; + gpointer key, value; - g_hash_table_iter_init (&iter, debuting_files); - while (g_hash_table_iter_next (&iter, &key, &value)) { - char *uri; - uri = g_file_get_uri (G_FILE (key)); - set_uri_as_wallpaper (uri); - g_free (uri); - break; - } + g_hash_table_iter_init (&iter, debuting_files); + while (g_hash_table_iter_next (&iter, &key, &value)) + { + char *uri; + uri = g_file_get_uri (G_FILE (key)); + set_uri_as_wallpaper (uri); + g_free (uri); + break; + } } static gboolean can_set_wallpaper (GList *selection) { - NautilusFile *file; + NautilusFile *file; - if (g_list_length (selection) != 1) { - return FALSE; - } + if (g_list_length (selection) != 1) + { + return FALSE; + } - file = NAUTILUS_FILE (selection->data); - if (!nautilus_file_is_mime_type (file, "image/*")) { - return FALSE; - } + file = NAUTILUS_FILE (selection->data); + if (!nautilus_file_is_mime_type (file, "image/*")) + { + return FALSE; + } - /* FIXME: check file size? */ + /* FIXME: check file size? */ - return TRUE; + return TRUE; } static void @@ -5925,44 +6306,45 @@ action_set_as_wallpaper (GSimpleAction *action, GVariant *state, gpointer user_data) { - GList *selection; - - /* Copy the item to Pictures/Wallpaper since it may be - remote. Then set it as the current wallpaper. */ - - g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); - - selection = nautilus_view_get_selection (user_data); - - if (can_set_wallpaper (selection) - && selection_not_empty_in_menu_callback (user_data, selection)) { - NautilusFile *file; - char *target_uri; - GList *uris; - GFile *parent; - GFile *target; - - file = NAUTILUS_FILE (selection->data); - - parent = g_file_new_for_path (g_get_user_special_dir (G_USER_DIRECTORY_PICTURES)); - target = g_file_get_child (parent, "Wallpapers"); - g_object_unref (parent); - g_file_make_directory_with_parents (target, NULL, NULL); - target_uri = g_file_get_uri (target); - g_object_unref (target); - uris = g_list_prepend (NULL, nautilus_file_get_uri (file)); - nautilus_file_operations_copy_move (uris, - NULL, - target_uri, - GDK_ACTION_COPY, - GTK_WIDGET (user_data), - wallpaper_copy_done_callback, - NULL); - g_free (target_uri); - g_list_free_full (uris, g_free); - } + GList *selection; - nautilus_file_list_free (selection); + /* Copy the item to Pictures/Wallpaper since it may be + * remote. Then set it as the current wallpaper. */ + + g_assert (NAUTILUS_IS_FILES_VIEW (user_data)); + + selection = nautilus_view_get_selection (user_data); + + if (can_set_wallpaper (selection) + && selection_not_empty_in_menu_callback (user_data, selection)) + { + NautilusFile *file; + char *target_uri; + GList *uris; + GFile *parent; + GFile *target; + + file = NAUTILUS_FILE (selection->data); + + parent = g_file_new_for_path (g_get_user_special_dir (G_USER_DIRECTORY_PICTURES)); + target = g_file_get_child (parent, "Wallpapers"); + g_object_unref (parent); + g_file_make_directory_with_parents (target, NULL, NULL); + target_uri = g_file_get_uri (target); + g_object_unref (target); + uris = g_list_prepend (NULL, nautilus_file_get_uri (file)); + nautilus_file_operations_copy_move (uris, + NULL, + target_uri, + GDK_ACTION_COPY, + GTK_WIDGET (user_data), + wallpaper_copy_done_callback, + NULL); + g_free (target_uri); + g_list_free_full (uris, g_free); + } + + nautilus_file_list_free (selection); } static void @@ -5971,25 +6353,26 @@ file_mount_callback (NautilusFile *file, GError *error, gpointer callback_data) { - NautilusFilesView *view; - - view = NAUTILUS_FILES_VIEW (callback_data); - - if (error != NULL && - (error->domain != G_IO_ERROR || - (error->code != G_IO_ERROR_CANCELLED && - error->code != G_IO_ERROR_FAILED_HANDLED && - error->code != G_IO_ERROR_ALREADY_MOUNTED))) { - char *text; - char *name; - name = nautilus_file_get_display_name (file); - /* Translators: %s is a file name formatted for display */ - text = g_strdup_printf (_("Unable to access “%s”"), name); - eel_show_error_dialog (text, error->message, - GTK_WINDOW (nautilus_files_view_get_window (view))); - g_free (text); - g_free (name); - } + NautilusFilesView *view; + + view = NAUTILUS_FILES_VIEW (callback_data); + + if (error != NULL && + (error->domain != G_IO_ERROR || + (error->code != G_IO_ERROR_CANCELLED && + error->code != G_IO_ERROR_FAILED_HANDLED && + error->code != G_IO_ERROR_ALREADY_MOUNTED))) + { + char *text; + char *name; + name = nautilus_file_get_display_name (file); + /* Translators: %s is a file name formatted for display */ + text = g_strdup_printf (_("Unable to access “%s”"), name); + eel_show_error_dialog (text, error->message, + GTK_WINDOW (nautilus_files_view_get_window (view))); + g_free (text); + g_free (name); + } } static void @@ -5998,25 +6381,26 @@ file_unmount_callback (NautilusFile *file, GError *error, gpointer callback_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (callback_data); - g_object_unref (view); + view = NAUTILUS_FILES_VIEW (callback_data); + g_object_unref (view); - if (error != NULL && - (error->domain != G_IO_ERROR || - (error->code != G_IO_ERROR_CANCELLED && - error->code != G_IO_ERROR_FAILED_HANDLED))) { - char *text; - char *name; - name = nautilus_file_get_display_name (file); - /* Translators: %s is a file name formatted for display */ - text = g_strdup_printf (_("Unable to remove “%s”"), name); - eel_show_error_dialog (text, error->message, - GTK_WINDOW (nautilus_files_view_get_window (view))); - g_free (text); - g_free (name); - } + if (error != NULL && + (error->domain != G_IO_ERROR || + (error->code != G_IO_ERROR_CANCELLED && + error->code != G_IO_ERROR_FAILED_HANDLED))) + { + char *text; + char *name; + name = nautilus_file_get_display_name (file); + /* Translators: %s is a file name formatted for display */ + text = g_strdup_printf (_("Unable to remove “%s”"), name); + eel_show_error_dialog (text, error->message, + GTK_WINDOW (nautilus_files_view_get_window (view))); + g_free (text); + g_free (name); + } } static void @@ -6025,25 +6409,26 @@ file_eject_callback (NautilusFile *file, GError *error, gpointer callback_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (callback_data); - g_object_unref (view); + view = NAUTILUS_FILES_VIEW (callback_data); + g_object_unref (view); - if (error != NULL && - (error->domain != G_IO_ERROR || - (error->code != G_IO_ERROR_CANCELLED && - error->code != G_IO_ERROR_FAILED_HANDLED))) { - char *text; - char *name; - name = nautilus_file_get_display_name (file); - /* Translators: %s is a file name formatted for display */ - text = g_strdup_printf (_("Unable to eject “%s”"), name); - eel_show_error_dialog (text, error->message, - GTK_WINDOW (nautilus_files_view_get_window (view))); - g_free (text); - g_free (name); - } + if (error != NULL && + (error->domain != G_IO_ERROR || + (error->code != G_IO_ERROR_CANCELLED && + error->code != G_IO_ERROR_FAILED_HANDLED))) + { + char *text; + char *name; + name = nautilus_file_get_display_name (file); + /* Translators: %s is a file name formatted for display */ + text = g_strdup_printf (_("Unable to eject “%s”"), name); + eel_show_error_dialog (text, error->message, + GTK_WINDOW (nautilus_files_view_get_window (view))); + g_free (text); + g_free (name); + } } static void @@ -6052,18 +6437,19 @@ file_stop_callback (NautilusFile *file, GError *error, gpointer callback_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (callback_data); + view = NAUTILUS_FILES_VIEW (callback_data); - if (error != NULL && - (error->domain != G_IO_ERROR || - (error->code != G_IO_ERROR_CANCELLED && - error->code != G_IO_ERROR_FAILED_HANDLED))) { - eel_show_error_dialog (_("Unable to stop drive"), - error->message, - GTK_WINDOW (nautilus_files_view_get_window (view))); - } + if (error != NULL && + (error->domain != G_IO_ERROR || + (error->code != G_IO_ERROR_CANCELLED && + error->code != G_IO_ERROR_FAILED_HANDLED))) + { + eel_show_error_dialog (_("Unable to stop drive"), + error->message, + GTK_WINDOW (nautilus_files_view_get_window (view))); + } } static void @@ -6071,27 +6457,29 @@ action_mount_volume (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFile *file; - GList *selection, *l; - NautilusFilesView *view; - GMountOperation *mount_op; + NautilusFile *file; + GList *selection, *l; + NautilusFilesView *view; + GMountOperation *mount_op; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - for (l = selection; l != NULL; l = l->next) { - file = NAUTILUS_FILE (l->data); - - if (nautilus_file_can_mount (file)) { - mount_op = gtk_mount_operation_new (nautilus_files_view_get_containing_window (view)); - g_mount_operation_set_password_save (mount_op, G_PASSWORD_SAVE_FOR_SESSION); - nautilus_file_mount (file, mount_op, NULL, - file_mount_callback, - view); - g_object_unref (mount_op); - } + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + for (l = selection; l != NULL; l = l->next) + { + file = NAUTILUS_FILE (l->data); + + if (nautilus_file_can_mount (file)) + { + mount_op = gtk_mount_operation_new (nautilus_files_view_get_containing_window (view)); + g_mount_operation_set_password_save (mount_op, G_PASSWORD_SAVE_FOR_SESSION); + nautilus_file_mount (file, mount_op, NULL, + file_mount_callback, + view); + g_object_unref (mount_op); } - nautilus_file_list_free (selection); + } + nautilus_file_list_free (selection); } static void @@ -6099,25 +6487,27 @@ action_unmount_volume (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFile *file; - GList *selection, *l; - NautilusFilesView *view; + NautilusFile *file; + GList *selection, *l; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - for (l = selection; l != NULL; l = l->next) { - file = NAUTILUS_FILE (l->data); - if (nautilus_file_can_unmount (file)) { - GMountOperation *mount_op; - mount_op = gtk_mount_operation_new (nautilus_files_view_get_containing_window (view)); - nautilus_file_unmount (file, mount_op, NULL, - file_unmount_callback, g_object_ref (view)); - g_object_unref (mount_op); - } + for (l = selection; l != NULL; l = l->next) + { + file = NAUTILUS_FILE (l->data); + if (nautilus_file_can_unmount (file)) + { + GMountOperation *mount_op; + mount_op = gtk_mount_operation_new (nautilus_files_view_get_containing_window (view)); + nautilus_file_unmount (file, mount_op, NULL, + file_unmount_callback, g_object_ref (view)); + g_object_unref (mount_op); } - nautilus_file_list_free (selection); + } + nautilus_file_list_free (selection); } static void @@ -6125,25 +6515,27 @@ action_eject_volume (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFile *file; - GList *selection, *l; - NautilusFilesView *view; + NautilusFile *file; + GList *selection, *l; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - for (l = selection; l != NULL; l = l->next) { - file = NAUTILUS_FILE (l->data); - - if (nautilus_file_can_eject (file)) { - GMountOperation *mount_op; - mount_op = gtk_mount_operation_new (nautilus_files_view_get_containing_window (view)); - nautilus_file_eject (file, mount_op, NULL, - file_eject_callback, g_object_ref (view)); - g_object_unref (mount_op); - } + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + for (l = selection; l != NULL; l = l->next) + { + file = NAUTILUS_FILE (l->data); + + if (nautilus_file_can_eject (file)) + { + GMountOperation *mount_op; + mount_op = gtk_mount_operation_new (nautilus_files_view_get_containing_window (view)); + nautilus_file_eject (file, mount_op, NULL, + file_eject_callback, g_object_ref (view)); + g_object_unref (mount_op); } - nautilus_file_list_free (selection); + } + nautilus_file_list_free (selection); } static void @@ -6152,25 +6544,26 @@ file_start_callback (NautilusFile *file, GError *error, gpointer callback_data) { - NautilusFilesView *view; - - view = NAUTILUS_FILES_VIEW (callback_data); - - if (error != NULL && - (error->domain != G_IO_ERROR || - (error->code != G_IO_ERROR_CANCELLED && - error->code != G_IO_ERROR_FAILED_HANDLED && - error->code != G_IO_ERROR_ALREADY_MOUNTED))) { - char *text; - char *name; - name = nautilus_file_get_display_name (file); - /* Translators: %s is a file name formatted for display */ - text = g_strdup_printf (_("Unable to start “%s”"), name); - eel_show_error_dialog (text, error->message, - GTK_WINDOW (nautilus_files_view_get_window (view))); - g_free (text); - g_free (name); - } + NautilusFilesView *view; + + view = NAUTILUS_FILES_VIEW (callback_data); + + if (error != NULL && + (error->domain != G_IO_ERROR || + (error->code != G_IO_ERROR_CANCELLED && + error->code != G_IO_ERROR_FAILED_HANDLED && + error->code != G_IO_ERROR_ALREADY_MOUNTED))) + { + char *text; + char *name; + name = nautilus_file_get_display_name (file); + /* Translators: %s is a file name formatted for display */ + text = g_strdup_printf (_("Unable to start “%s”"), name); + eel_show_error_dialog (text, error->message, + GTK_WINDOW (nautilus_files_view_get_window (view))); + g_free (text); + g_free (name); + } } static void @@ -6178,25 +6571,27 @@ action_start_volume (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFile *file; - GList *selection, *l; - NautilusFilesView *view; - GMountOperation *mount_op; + NautilusFile *file; + GList *selection, *l; + NautilusFilesView *view; + GMountOperation *mount_op; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - for (l = selection; l != NULL; l = l->next) { - file = NAUTILUS_FILE (l->data); - - if (nautilus_file_can_start (file) || nautilus_file_can_start_degraded (file)) { - mount_op = gtk_mount_operation_new (nautilus_files_view_get_containing_window (view)); - nautilus_file_start (file, mount_op, NULL, - file_start_callback, view); - g_object_unref (mount_op); - } + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + for (l = selection; l != NULL; l = l->next) + { + file = NAUTILUS_FILE (l->data); + + if (nautilus_file_can_start (file) || nautilus_file_can_start_degraded (file)) + { + mount_op = gtk_mount_operation_new (nautilus_files_view_get_containing_window (view)); + nautilus_file_start (file, mount_op, NULL, + file_start_callback, view); + g_object_unref (mount_op); } - nautilus_file_list_free (selection); + } + nautilus_file_list_free (selection); } static void @@ -6204,25 +6599,27 @@ action_stop_volume (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFile *file; - GList *selection, *l; - NautilusFilesView *view; + NautilusFile *file; + GList *selection, *l; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (user_data); + view = NAUTILUS_FILES_VIEW (user_data); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - for (l = selection; l != NULL; l = l->next) { - file = NAUTILUS_FILE (l->data); - - if (nautilus_file_can_stop (file)) { - GMountOperation *mount_op; - mount_op = gtk_mount_operation_new (nautilus_files_view_get_containing_window (view)); - nautilus_file_stop (file, mount_op, NULL, - file_stop_callback, view); - g_object_unref (mount_op); - } + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + for (l = selection; l != NULL; l = l->next) + { + file = NAUTILUS_FILE (l->data); + + if (nautilus_file_can_stop (file)) + { + GMountOperation *mount_op; + mount_op = gtk_mount_operation_new (nautilus_files_view_get_containing_window (view)); + nautilus_file_stop (file, mount_op, NULL, + file_stop_callback, view); + g_object_unref (mount_op); } - nautilus_file_list_free (selection); + } + nautilus_file_list_free (selection); } static void @@ -6230,115 +6627,120 @@ action_detect_media (GSimpleAction *action, GVariant *state, gpointer user_data) { - NautilusFile *file; - GList *selection, *l; - NautilusView *view; - - view = NAUTILUS_VIEW (user_data); - - selection = nautilus_view_get_selection (view); - for (l = selection; l != NULL; l = l->next) { - file = NAUTILUS_FILE (l->data); - - if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) { - nautilus_file_poll_for_media (file); - } - } - nautilus_file_list_free (selection); -} - -const GActionEntry view_entries[] = { - /* Toolbar menu */ - { "zoom-in", action_zoom_in }, - { "zoom-out", action_zoom_out }, - { "zoom-standard", action_zoom_standard }, - { "show-hidden-files", NULL, NULL, "true", action_show_hidden_files }, - /* Background menu */ - { "new-folder", action_new_folder }, - { "select-all", action_select_all }, - { "paste", action_paste_files }, - { "create-link", action_create_links }, - { "new-document" }, - /* Selection menu */ - { "scripts" }, - { "new-folder-with-selection", action_new_folder_with_selection }, - { "open-scripts-folder", action_open_scripts_folder }, - { "open-item-location", action_open_item_location }, - { "open-with-default-application", action_open_with_default_application }, - { "open-with-other-application", action_open_with_other_application }, - { "open-item-new-window", action_open_item_new_window }, - { "open-item-new-tab", action_open_item_new_tab }, - { "cut", action_cut}, - { "copy", action_copy}, - { "create-link-in-place", action_create_links_in_place }, - { "move-to", action_move_to}, - { "copy-to", action_copy_to}, - { "move-to-trash", action_move_to_trash}, - { "delete-from-trash", action_delete }, - /* We separate the shortcut and the menu item since we want the shortcut - * to always be available, but we don't want the menu item shown if not - * completely necesary. Since the visibility of the menu item is based on - * the action enability, we need to split the actions for the menu and the - * shortcut. */ - { "delete-permanently-shortcut", action_delete }, - { "delete-permanently-menu-item", action_delete }, - /* This is only shown when the setting to show always delete permanently - * is set and when the common use cases for delete permanently which uses - * Delete as a shortcut are not needed. For instance this will be only - * present when the setting is true and when it can trash files */ - { "permanent-delete-permanently-menu-item", action_delete }, - { "remove-from-recent", action_remove_from_recent }, - { "restore-from-trash", action_restore_from_trash}, - { "paste-into", action_paste_files_into }, - { "rename", action_rename}, - { "extract-here", action_extract_here }, - { "extract-to", action_extract_to }, - { "compress", action_compress }, - { "properties", action_properties}, - { "set-as-wallpaper", action_set_as_wallpaper }, - { "mount-volume", action_mount_volume }, - { "unmount-volume", action_unmount_volume }, - { "eject-volume", action_eject_volume }, - { "start-volume", action_start_volume }, - { "stop-volume", action_stop_volume }, - { "detect-media", action_detect_media }, - /* Only accesible by shorcuts */ - { "select-pattern", action_select_pattern }, - { "invert-selection", action_invert_selection }, - { "open-file-and-close-window", action_open_file_and_close_window }, - /* Warning dialog for the change of the shorcut to move to trash */ - { "show-move-to-trash-shortcut-changed-dialog", action_show_move_to_trash_shortcut_changed_dialog } + NautilusFile *file; + GList *selection, *l; + NautilusView *view; + + view = NAUTILUS_VIEW (user_data); + + selection = nautilus_view_get_selection (view); + for (l = selection; l != NULL; l = l->next) + { + file = NAUTILUS_FILE (l->data); + + if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) + { + nautilus_file_poll_for_media (file); + } + } + nautilus_file_list_free (selection); +} + +const GActionEntry view_entries[] = +{ + /* Toolbar menu */ + { "zoom-in", action_zoom_in }, + { "zoom-out", action_zoom_out }, + { "zoom-standard", action_zoom_standard }, + { "show-hidden-files", NULL, NULL, "true", action_show_hidden_files }, + /* Background menu */ + { "new-folder", action_new_folder }, + { "select-all", action_select_all }, + { "paste", action_paste_files }, + { "create-link", action_create_links }, + { "new-document" }, + /* Selection menu */ + { "scripts" }, + { "new-folder-with-selection", action_new_folder_with_selection }, + { "open-scripts-folder", action_open_scripts_folder }, + { "open-item-location", action_open_item_location }, + { "open-with-default-application", action_open_with_default_application }, + { "open-with-other-application", action_open_with_other_application }, + { "open-item-new-window", action_open_item_new_window }, + { "open-item-new-tab", action_open_item_new_tab }, + { "cut", action_cut}, + { "copy", action_copy}, + { "create-link-in-place", action_create_links_in_place }, + { "move-to", action_move_to}, + { "copy-to", action_copy_to}, + { "move-to-trash", action_move_to_trash}, + { "delete-from-trash", action_delete }, + /* We separate the shortcut and the menu item since we want the shortcut + * to always be available, but we don't want the menu item shown if not + * completely necesary. Since the visibility of the menu item is based on + * the action enability, we need to split the actions for the menu and the + * shortcut. */ + { "delete-permanently-shortcut", action_delete }, + { "delete-permanently-menu-item", action_delete }, + /* This is only shown when the setting to show always delete permanently + * is set and when the common use cases for delete permanently which uses + * Delete as a shortcut are not needed. For instance this will be only + * present when the setting is true and when it can trash files */ + { "permanent-delete-permanently-menu-item", action_delete }, + { "remove-from-recent", action_remove_from_recent }, + { "restore-from-trash", action_restore_from_trash}, + { "paste-into", action_paste_files_into }, + { "rename", action_rename}, + { "extract-here", action_extract_here }, + { "extract-to", action_extract_to }, + { "compress", action_compress }, + { "properties", action_properties}, + { "set-as-wallpaper", action_set_as_wallpaper }, + { "mount-volume", action_mount_volume }, + { "unmount-volume", action_unmount_volume }, + { "eject-volume", action_eject_volume }, + { "start-volume", action_start_volume }, + { "stop-volume", action_stop_volume }, + { "detect-media", action_detect_media }, + /* Only accesible by shorcuts */ + { "select-pattern", action_select_pattern }, + { "invert-selection", action_invert_selection }, + { "open-file-and-close-window", action_open_file_and_close_window }, + /* Warning dialog for the change of the shorcut to move to trash */ + { "show-move-to-trash-shortcut-changed-dialog", action_show_move_to_trash_shortcut_changed_dialog } }; static gboolean can_paste_into_file (NautilusFile *file) { - if (nautilus_file_is_directory (file) && - nautilus_file_can_write (file)) { - return TRUE; - } - if (nautilus_file_has_activation_uri (file)) { - GFile *location; - NautilusFile *activation_file; - gboolean res; + if (nautilus_file_is_directory (file) && + nautilus_file_can_write (file)) + { + return TRUE; + } + if (nautilus_file_has_activation_uri (file)) + { + GFile *location; + NautilusFile *activation_file; + gboolean res; - location = nautilus_file_get_activation_location (file); - activation_file = nautilus_file_get (location); - g_object_unref (location); + location = nautilus_file_get_activation_location (file); + activation_file = nautilus_file_get (location); + g_object_unref (location); - /* The target location might not have data for it read yet, - and we can't want to do sync I/O, so treat the unknown - case as can-write */ - res = (nautilus_file_get_file_type (activation_file) == G_FILE_TYPE_UNKNOWN) || - (nautilus_file_get_file_type (activation_file) == G_FILE_TYPE_DIRECTORY && - nautilus_file_can_write (activation_file)); + /* The target location might not have data for it read yet, + * and we can't want to do sync I/O, so treat the unknown + * case as can-write */ + res = (nautilus_file_get_file_type (activation_file) == G_FILE_TYPE_UNKNOWN) || + (nautilus_file_get_file_type (activation_file) == G_FILE_TYPE_DIRECTORY && + nautilus_file_can_write (activation_file)); - nautilus_file_unref (activation_file); + nautilus_file_unref (activation_file); - return res; - } + return res; + } - return FALSE; + return FALSE; } static void @@ -6347,49 +6749,53 @@ clipboard_targets_received (GtkClipboard *clipboard, int n_targets, gpointer user_data) { - NautilusFilesView *view; - gboolean is_data_copied; - int i; - GAction *action; - - view = NAUTILUS_FILES_VIEW (user_data); - is_data_copied = FALSE; + NautilusFilesView *view; + gboolean is_data_copied; + int i; + GAction *action; - if (view->details->slot == NULL || - !view->details->active) { - /* We've been destroyed or became inactive since call */ - g_object_unref (view); - return; - } + view = NAUTILUS_FILES_VIEW (user_data); + is_data_copied = FALSE; - if (targets) { - for (i = 0; i < n_targets; i++) { - if (targets[i] == copied_files_atom) { - is_data_copied = TRUE; - } - } + if (view->details->slot == NULL || + !view->details->active) + { + /* We've been destroyed or became inactive since call */ + g_object_unref (view); + return; + } + + if (targets) + { + for (i = 0; i < n_targets; i++) + { + if (targets[i] == copied_files_atom) + { + is_data_copied = TRUE; + } } + } - action = g_action_map_lookup_action (G_ACTION_MAP (view->details->view_action_group), - "paste"); - /* Take into account if the action was previously disabled for other reasons, - * like the directory not being writabble */ - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - is_data_copied && g_action_get_enabled (action)); + action = g_action_map_lookup_action (G_ACTION_MAP (view->details->view_action_group), + "paste"); + /* Take into account if the action was previously disabled for other reasons, + * like the directory not being writabble */ + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + is_data_copied && g_action_get_enabled (action)); - action = g_action_map_lookup_action (G_ACTION_MAP (view->details->view_action_group), - "paste-into"); + action = g_action_map_lookup_action (G_ACTION_MAP (view->details->view_action_group), + "paste-into"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - is_data_copied && g_action_get_enabled (action)); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + is_data_copied && g_action_get_enabled (action)); - action = g_action_map_lookup_action (G_ACTION_MAP (view->details->view_action_group), - "create-link"); + action = g_action_map_lookup_action (G_ACTION_MAP (view->details->view_action_group), + "create-link"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - is_data_copied && g_action_get_enabled (action)); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + is_data_copied && g_action_get_enabled (action)); - g_object_unref (view); + g_object_unref (view); } static void @@ -6402,512 +6808,544 @@ file_should_show_foreach (NautilusFile *file, gboolean *show_poll, GDriveStartStopType *start_stop_type) { - *show_mount = FALSE; - *show_unmount = FALSE; - *show_eject = FALSE; - *show_start = FALSE; - *show_stop = FALSE; - *show_poll = FALSE; + *show_mount = FALSE; + *show_unmount = FALSE; + *show_eject = FALSE; + *show_start = FALSE; + *show_stop = FALSE; + *show_poll = FALSE; - if (nautilus_file_can_eject (file)) { - *show_eject = TRUE; - } + if (nautilus_file_can_eject (file)) + { + *show_eject = TRUE; + } - if (nautilus_file_can_mount (file)) { - *show_mount = TRUE; - } + if (nautilus_file_can_mount (file)) + { + *show_mount = TRUE; + } - if (nautilus_file_can_start (file) || nautilus_file_can_start_degraded (file)) { - *show_start = TRUE; - } + if (nautilus_file_can_start (file) || nautilus_file_can_start_degraded (file)) + { + *show_start = TRUE; + } - if (nautilus_file_can_stop (file)) { - *show_stop = TRUE; - } + if (nautilus_file_can_stop (file)) + { + *show_stop = TRUE; + } - /* Dot not show both Unmount and Eject/Safe Removal; too confusing to - * have too many menu entries */ - if (nautilus_file_can_unmount (file) && !*show_eject && !*show_stop) { - *show_unmount = TRUE; - } + /* Dot not show both Unmount and Eject/Safe Removal; too confusing to + * have too many menu entries */ + if (nautilus_file_can_unmount (file) && !*show_eject && !*show_stop) + { + *show_unmount = TRUE; + } - if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) { - *show_poll = TRUE; - } + if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) + { + *show_poll = TRUE; + } - *start_stop_type = nautilus_file_get_start_stop_type (file); + *start_stop_type = nautilus_file_get_start_stop_type (file); } static gboolean can_restore_from_trash (GList *files) { - NautilusFile *original_file; - NautilusFile *original_dir; - GHashTable *original_dirs_hash; - GList *original_dirs; - gboolean can_restore; - - original_file = NULL; - original_dir = NULL; - original_dirs = NULL; - original_dirs_hash = NULL; - - if (files != NULL) { - if (g_list_length (files) == 1) { - original_file = nautilus_file_get_trash_original_file (files->data); - } else { - original_dirs_hash = nautilus_trashed_files_get_original_directories (files, NULL); - if (original_dirs_hash != NULL) { - original_dirs = g_hash_table_get_keys (original_dirs_hash); - if (g_list_length (original_dirs) == 1) { - original_dir = nautilus_file_ref (NAUTILUS_FILE (original_dirs->data)); - } - } + NautilusFile *original_file; + NautilusFile *original_dir; + GHashTable *original_dirs_hash; + GList *original_dirs; + gboolean can_restore; + + original_file = NULL; + original_dir = NULL; + original_dirs = NULL; + original_dirs_hash = NULL; + + if (files != NULL) + { + if (g_list_length (files) == 1) + { + original_file = nautilus_file_get_trash_original_file (files->data); + } + else + { + original_dirs_hash = nautilus_trashed_files_get_original_directories (files, NULL); + if (original_dirs_hash != NULL) + { + original_dirs = g_hash_table_get_keys (original_dirs_hash); + if (g_list_length (original_dirs) == 1) + { + original_dir = nautilus_file_ref (NAUTILUS_FILE (original_dirs->data)); } + } } + } - can_restore = original_file != NULL || original_dirs != NULL; + can_restore = original_file != NULL || original_dirs != NULL; - nautilus_file_unref (original_file); - nautilus_file_unref (original_dir); - g_list_free (original_dirs); + nautilus_file_unref (original_file); + nautilus_file_unref (original_dir); + g_list_free (original_dirs); - if (original_dirs_hash != NULL) { - g_hash_table_destroy (original_dirs_hash); - } - return can_restore; + if (original_dirs_hash != NULL) + { + g_hash_table_destroy (original_dirs_hash); + } + return can_restore; } static void clipboard_changed_callback (NautilusClipboardMonitor *monitor, NautilusFilesView *view) { - /* Update paste menu item */ - nautilus_files_view_update_context_menus (view); + /* Update paste menu item */ + nautilus_files_view_update_context_menus (view); } static gboolean can_delete_all (GList *files) { - NautilusFile *file; - GList *l; + NautilusFile *file; + GList *l; - for (l = files; l != NULL; l = l->next) { - file = l->data; - if (!nautilus_file_can_delete (file)) { - return FALSE; - } + for (l = files; l != NULL; l = l->next) + { + file = l->data; + if (!nautilus_file_can_delete (file)) + { + return FALSE; } - return TRUE; + } + return TRUE; } static gboolean can_trash_all (GList *files) { - NautilusFile *file; - GList *l; + NautilusFile *file; + GList *l; - for (l = files; l != NULL; l = l->next) { - file = l->data; - if (!nautilus_file_can_trash (file)) { - return FALSE; - } + for (l = files; l != NULL; l = l->next) + { + file = l->data; + if (!nautilus_file_can_trash (file)) + { + return FALSE; } - return TRUE; + } + return TRUE; } static gboolean all_in_trash (GList *files) { - NautilusFile *file; - GList *l; + NautilusFile *file; + GList *l; - for (l = files; l != NULL; l = l->next) { - file = l->data; - if (!nautilus_file_is_in_trash (file)) { - return FALSE; - } + for (l = files; l != NULL; l = l->next) + { + file = l->data; + if (!nautilus_file_is_in_trash (file)) + { + return FALSE; } - return TRUE; + } + return TRUE; } static gboolean can_extract_all (GList *files) { - NautilusFile *file; - GList *l; + NautilusFile *file; + GList *l; - for (l = files; l != NULL; l = l->next) { - file = l->data; - if (!nautilus_file_is_archive (file)) { - return FALSE; - } + for (l = files; l != NULL; l = l->next) + { + file = l->data; + if (!nautilus_file_is_archive (file)) + { + return FALSE; } - return TRUE; + } + return TRUE; } GActionGroup * nautilus_files_view_get_action_group (NautilusFilesView *view) { - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - return view->details->view_action_group; + return view->details->view_action_group; } static void real_update_actions_state (NautilusFilesView *view) { - GList *selection, *l; - NautilusFile *file; - gint selection_count; - gboolean selection_contains_special_link; - gboolean selection_contains_desktop_or_home_dir; - gboolean selection_contains_recent; - gboolean selection_contains_search; - gboolean selection_all_in_trash; - gboolean selection_is_read_only; - gboolean can_create_files; - gboolean can_delete_files; - gboolean can_move_files; - gboolean can_trash_files; - gboolean can_copy_files; - gboolean can_link_from_copied_files; - gboolean can_paste_files_into; - gboolean can_extract_files; - gboolean can_extract_here; - gboolean item_opens_in_view; - gboolean is_read_only; - GAction *action; - GActionGroup *view_action_group; - gboolean show_mount; - gboolean show_unmount; - gboolean show_eject; - gboolean show_start; - gboolean show_stop; - gboolean show_detect_media; - gboolean settings_show_delete_permanently; - gboolean settings_show_create_link; - gboolean settings_automatic_decompression; - GDriveStartStopType start_stop_type; - - view_action_group = view->details->view_action_group; - - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - selection_count = g_list_length (selection); - selection_contains_special_link = nautilus_files_view_special_link_in_selection (view, selection); - selection_contains_desktop_or_home_dir = desktop_or_home_dir_in_selection (selection); - selection_contains_recent = showing_recent_directory (view); - selection_contains_search = nautilus_view_is_searching (NAUTILUS_VIEW (view)); - selection_is_read_only = selection_count == 1 && - (!nautilus_file_can_write (NAUTILUS_FILE (selection->data)) && - !nautilus_file_has_activation_uri (NAUTILUS_FILE (selection->data))); - selection_all_in_trash = all_in_trash (selection); - - is_read_only = nautilus_files_view_is_read_only (view); - can_create_files = nautilus_files_view_supports_creating_files (view); - can_delete_files = - can_delete_all (selection) && - selection_count != 0 && - !selection_contains_special_link && - !selection_contains_desktop_or_home_dir; - can_trash_files = - can_trash_all (selection) && - selection_count != 0 && - !selection_contains_special_link && - !selection_contains_desktop_or_home_dir; - can_copy_files = selection_count != 0 - && !selection_contains_special_link; - can_link_from_copied_files = !nautilus_clipboard_monitor_is_cut (nautilus_clipboard_monitor_get ()) && - !selection_contains_recent && !is_read_only; - can_move_files = can_delete_files && !selection_contains_recent; - can_paste_files_into = (!selection_contains_recent && - selection_count == 1 && - can_paste_into_file (NAUTILUS_FILE (selection->data))); - can_extract_files = selection_count != 0 && - can_extract_all (selection); - can_extract_here = nautilus_files_view_supports_extract_here (view); - settings_show_delete_permanently = g_settings_get_boolean (nautilus_preferences, - NAUTILUS_PREFERENCES_SHOW_DELETE_PERMANENTLY); - settings_show_create_link = g_settings_get_boolean (nautilus_preferences, - NAUTILUS_PREFERENCES_SHOW_CREATE_LINK); - settings_automatic_decompression = g_settings_get_boolean (nautilus_preferences, - NAUTILUS_PREFERENCES_AUTOMATIC_DECOMPRESSION); - - /* Right click actions */ - /* Selection menu actions */ - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "new-folder-with-selection"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_create_files && can_delete_files && (selection_count > 1) && !selection_contains_recent); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "rename"); - if (selection_count > 1) { - if (have_bulk_rename_tool()) - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - have_bulk_rename_tool ()); - else - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - nautilus_file_can_rename_files (selection)); - } else { - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - selection_count == 1 && - nautilus_file_can_rename (selection->data)); - } - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "extract-here"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_extract_files && - !settings_automatic_decompression && - can_extract_here); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "extract-to"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_extract_files && - (!settings_automatic_decompression || - can_extract_here)); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "compress"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - !can_extract_files && can_create_files); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "open-item-location"); - + GList *selection, *l; + NautilusFile *file; + gint selection_count; + gboolean selection_contains_special_link; + gboolean selection_contains_desktop_or_home_dir; + gboolean selection_contains_recent; + gboolean selection_contains_search; + gboolean selection_all_in_trash; + gboolean selection_is_read_only; + gboolean can_create_files; + gboolean can_delete_files; + gboolean can_move_files; + gboolean can_trash_files; + gboolean can_copy_files; + gboolean can_link_from_copied_files; + gboolean can_paste_files_into; + gboolean can_extract_files; + gboolean can_extract_here; + gboolean item_opens_in_view; + gboolean is_read_only; + GAction *action; + GActionGroup *view_action_group; + gboolean show_mount; + gboolean show_unmount; + gboolean show_eject; + gboolean show_start; + gboolean show_stop; + gboolean show_detect_media; + gboolean settings_show_delete_permanently; + gboolean settings_show_create_link; + gboolean settings_automatic_decompression; + GDriveStartStopType start_stop_type; + + view_action_group = view->details->view_action_group; + + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + selection_count = g_list_length (selection); + selection_contains_special_link = nautilus_files_view_special_link_in_selection (view, selection); + selection_contains_desktop_or_home_dir = desktop_or_home_dir_in_selection (selection); + selection_contains_recent = showing_recent_directory (view); + selection_contains_search = nautilus_view_is_searching (NAUTILUS_VIEW (view)); + selection_is_read_only = selection_count == 1 && + (!nautilus_file_can_write (NAUTILUS_FILE (selection->data)) && + !nautilus_file_has_activation_uri (NAUTILUS_FILE (selection->data))); + selection_all_in_trash = all_in_trash (selection); + + is_read_only = nautilus_files_view_is_read_only (view); + can_create_files = nautilus_files_view_supports_creating_files (view); + can_delete_files = + can_delete_all (selection) && + selection_count != 0 && + !selection_contains_special_link && + !selection_contains_desktop_or_home_dir; + can_trash_files = + can_trash_all (selection) && + selection_count != 0 && + !selection_contains_special_link && + !selection_contains_desktop_or_home_dir; + can_copy_files = selection_count != 0 + && !selection_contains_special_link; + can_link_from_copied_files = !nautilus_clipboard_monitor_is_cut (nautilus_clipboard_monitor_get ()) && + !selection_contains_recent && !is_read_only; + can_move_files = can_delete_files && !selection_contains_recent; + can_paste_files_into = (!selection_contains_recent && + selection_count == 1 && + can_paste_into_file (NAUTILUS_FILE (selection->data))); + can_extract_files = selection_count != 0 && + can_extract_all (selection); + can_extract_here = nautilus_files_view_supports_extract_here (view); + settings_show_delete_permanently = g_settings_get_boolean (nautilus_preferences, + NAUTILUS_PREFERENCES_SHOW_DELETE_PERMANENTLY); + settings_show_create_link = g_settings_get_boolean (nautilus_preferences, + NAUTILUS_PREFERENCES_SHOW_CREATE_LINK); + settings_automatic_decompression = g_settings_get_boolean (nautilus_preferences, + NAUTILUS_PREFERENCES_AUTOMATIC_DECOMPRESSION); + + /* Right click actions */ + /* Selection menu actions */ + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "new-folder-with-selection"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_create_files && can_delete_files && (selection_count > 1) && !selection_contains_recent); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "rename"); + if (selection_count > 1) + { + if (have_bulk_rename_tool ()) + { + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + have_bulk_rename_tool ()); + } + else + { + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + nautilus_file_can_rename_files (selection)); + } + } + else + { g_simple_action_set_enabled (G_SIMPLE_ACTION (action), selection_count == 1 && - (selection_contains_recent || selection_contains_search)); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "new-folder"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), can_create_files); - - item_opens_in_view = selection_count != 0; - - for (l = selection; l != NULL; l = l->next) { - NautilusFile *file; - - file = NAUTILUS_FILE (selection->data); - - if (!nautilus_file_opens_in_view (file)) { - item_opens_in_view = FALSE; - } - - if (!item_opens_in_view) { - break; - } - } - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "open-with-default-application"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), selection_count != 0); - - /* Allow to select a different application to open the item */ - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "open-with-other-application"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - selection_count > 0); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "open-item-new-tab"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), item_opens_in_view); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "open-item-new-window"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), item_opens_in_view); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "set-as-wallpaper"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), can_set_wallpaper (selection)); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "restore-from-trash"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), can_restore_from_trash (selection)); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "move-to-trash"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), can_trash_files); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "delete-from-trash"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_delete_files && selection_all_in_trash); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "delete-permanently-shortcut"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_delete_files); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "delete-permanently-menu-item"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_delete_files && !can_trash_files && - !selection_all_in_trash && !selection_contains_recent); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "permanent-delete-permanently-menu-item"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_delete_files && can_trash_files && - settings_show_delete_permanently && - !selection_all_in_trash && !selection_contains_recent); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "remove-from-recent"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - selection_contains_recent && selection_count > 0); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "cut"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_move_files && !selection_contains_recent); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "copy"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_copy_files); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "create-link-in-place"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_copy_files && - can_create_files && - settings_show_create_link); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "copy-to"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_copy_files); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "move-to"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_move_files && !selection_contains_recent); - - /* Drive menu */ - show_mount = show_unmount = show_eject = show_start = show_stop = show_detect_media = FALSE; - for (l = selection; l != NULL && (show_mount || show_unmount - || show_eject - || show_start || show_stop - || show_detect_media); - l = l->next) { - gboolean show_mount_one; - gboolean show_unmount_one; - gboolean show_eject_one; - gboolean show_start_one; - gboolean show_stop_one; - gboolean show_detect_media_one; - - file = NAUTILUS_FILE (l->data); - file_should_show_foreach (file, - &show_mount_one, - &show_unmount_one, - &show_eject_one, - &show_start_one, - &show_stop_one, - &show_detect_media_one, - &start_stop_type); - - show_mount &= show_mount_one; - show_unmount &= show_unmount_one; - show_eject &= show_eject_one; - show_start &= show_start_one; - show_stop &= show_stop_one; - show_detect_media &= show_detect_media_one; - } - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "mount-volume"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - show_mount); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "unmount-volume"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - show_unmount); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "eject-volume"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - show_eject); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "start-volume"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - show_start); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "stop-volume"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - show_stop); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "detect-media"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - show_detect_media); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "scripts"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - view->details->scripts_present); - - /* Background menu actions */ - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "new-folder"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), can_create_files); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "paste"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - !is_read_only && !selection_contains_recent); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "create-link"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_link_from_copied_files && - settings_show_create_link); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "paste-into"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - !selection_is_read_only && !selection_contains_recent && - can_paste_files_into); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "properties"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - TRUE); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "new-document"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - can_create_files && - !selection_contains_recent && - view->details->templates_present); - - /* Ask the clipboard */ - g_object_ref (view); /* Need to keep the object alive until we get the reply */ - gtk_clipboard_request_targets (nautilus_clipboard_get (GTK_WIDGET (view)), - clipboard_targets_received, - view); - - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "select-all"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - !nautilus_files_view_is_empty (view)); - - /* Toolbar menu actions */ - g_action_group_change_action_state (view_action_group, - "show-hidden-files", - g_variant_new_boolean (view->details->show_hidden_files)); + nautilus_file_can_rename (selection->data)); + } + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "extract-here"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_extract_files && + !settings_automatic_decompression && + can_extract_here); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "extract-to"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_extract_files && + (!settings_automatic_decompression || + can_extract_here)); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "compress"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + !can_extract_files && can_create_files); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "open-item-location"); + + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + selection_count == 1 && + (selection_contains_recent || selection_contains_search)); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "new-folder"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), can_create_files); + + item_opens_in_view = selection_count != 0; + + for (l = selection; l != NULL; l = l->next) + { + NautilusFile *file; - /* Zoom */ - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "zoom-in"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - nautilus_files_view_can_zoom_in (view)); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "zoom-out"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - nautilus_files_view_can_zoom_out (view)); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "zoom-standard"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - nautilus_files_view_supports_zooming (view)); - action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), - "zoom-to-level"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - !nautilus_files_view_is_empty (view)); + file = NAUTILUS_FILE (selection->data); - nautilus_file_list_free (selection); + if (!nautilus_file_opens_in_view (file)) + { + item_opens_in_view = FALSE; + } + + if (!item_opens_in_view) + { + break; + } + } + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "open-with-default-application"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), selection_count != 0); + + /* Allow to select a different application to open the item */ + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "open-with-other-application"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + selection_count > 0); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "open-item-new-tab"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), item_opens_in_view); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "open-item-new-window"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), item_opens_in_view); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "set-as-wallpaper"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), can_set_wallpaper (selection)); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "restore-from-trash"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), can_restore_from_trash (selection)); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "move-to-trash"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), can_trash_files); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "delete-from-trash"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_delete_files && selection_all_in_trash); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "delete-permanently-shortcut"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_delete_files); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "delete-permanently-menu-item"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_delete_files && !can_trash_files && + !selection_all_in_trash && !selection_contains_recent); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "permanent-delete-permanently-menu-item"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_delete_files && can_trash_files && + settings_show_delete_permanently && + !selection_all_in_trash && !selection_contains_recent); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "remove-from-recent"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + selection_contains_recent && selection_count > 0); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "cut"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_move_files && !selection_contains_recent); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "copy"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_copy_files); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "create-link-in-place"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_copy_files && + can_create_files && + settings_show_create_link); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "copy-to"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_copy_files); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "move-to"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_move_files && !selection_contains_recent); + + /* Drive menu */ + show_mount = show_unmount = show_eject = show_start = show_stop = show_detect_media = FALSE; + for (l = selection; l != NULL && (show_mount || show_unmount + || show_eject + || show_start || show_stop + || show_detect_media); + l = l->next) + { + gboolean show_mount_one; + gboolean show_unmount_one; + gboolean show_eject_one; + gboolean show_start_one; + gboolean show_stop_one; + gboolean show_detect_media_one; + + file = NAUTILUS_FILE (l->data); + file_should_show_foreach (file, + &show_mount_one, + &show_unmount_one, + &show_eject_one, + &show_start_one, + &show_stop_one, + &show_detect_media_one, + &start_stop_type); + + show_mount &= show_mount_one; + show_unmount &= show_unmount_one; + show_eject &= show_eject_one; + show_start &= show_start_one; + show_stop &= show_stop_one; + show_detect_media &= show_detect_media_one; + } + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "mount-volume"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + show_mount); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "unmount-volume"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + show_unmount); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "eject-volume"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + show_eject); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "start-volume"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + show_start); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "stop-volume"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + show_stop); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "detect-media"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + show_detect_media); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "scripts"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + view->details->scripts_present); + + /* Background menu actions */ + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "new-folder"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), can_create_files); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "paste"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + !is_read_only && !selection_contains_recent); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "create-link"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_link_from_copied_files && + settings_show_create_link); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "paste-into"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + !selection_is_read_only && !selection_contains_recent && + can_paste_files_into); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "properties"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + TRUE); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "new-document"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + can_create_files && + !selection_contains_recent && + view->details->templates_present); + + /* Ask the clipboard */ + g_object_ref (view); /* Need to keep the object alive until we get the reply */ + gtk_clipboard_request_targets (nautilus_clipboard_get (GTK_WIDGET (view)), + clipboard_targets_received, + view); + + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "select-all"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + !nautilus_files_view_is_empty (view)); + + /* Toolbar menu actions */ + g_action_group_change_action_state (view_action_group, + "show-hidden-files", + g_variant_new_boolean (view->details->show_hidden_files)); + + /* Zoom */ + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "zoom-in"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + nautilus_files_view_can_zoom_in (view)); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "zoom-out"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + nautilus_files_view_can_zoom_out (view)); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "zoom-standard"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + nautilus_files_view_supports_zooming (view)); + action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group), + "zoom-to-level"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + !nautilus_files_view_is_empty (view)); + + nautilus_file_list_free (selection); } /* Convenience function to be called when updating menus, @@ -6918,241 +7356,289 @@ real_update_actions_state (NautilusFilesView *view) void nautilus_files_view_update_actions_state (NautilusFilesView *view) { - g_assert(NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->update_actions_state (view); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->update_actions_state (view); } static void update_selection_menu (NautilusFilesView *view) { - GList *selection, *l; + GList *selection, *l; + NautilusFile *file; + gint selection_count; + gboolean show_app; + gboolean show_run; + gboolean show_extract; + gboolean item_opens_in_view; + gchar *item_label; + GAppInfo *app; + GIcon *app_icon; + GMenuItem *menu_item; + gboolean show_mount; + gboolean show_unmount; + gboolean show_eject; + gboolean show_start; + gboolean show_stop; + gboolean show_detect_media; + GDriveStartStopType start_stop_type; + + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + selection_count = g_list_length (selection); + + show_mount = (selection != NULL); + show_unmount = (selection != NULL); + show_eject = (selection != NULL); + show_start = (selection != NULL && selection_count == 1); + show_stop = (selection != NULL && selection_count == 1); + show_detect_media = (selection != NULL && selection_count == 1); + start_stop_type = G_DRIVE_START_STOP_TYPE_UNKNOWN; + item_label = g_strdup_printf (ngettext ("New Folder with Selection (%'d Item)", + "New Folder with Selection (%'d Items)", + selection_count), + selection_count); + menu_item = g_menu_item_new (item_label, "view.new-folder-with-selection"); + g_menu_item_set_attribute (menu_item, "hidden-when", "s", "action-disabled"); + nautilus_gmenu_add_item_in_submodel (view->details->selection_menu, + menu_item, + "new-folder-with-selection-section", + FALSE); + g_object_unref (menu_item); + g_free (item_label); + + /* Open With <App> menu item */ + show_extract = show_app = show_run = item_opens_in_view = selection_count != 0; + for (l = selection; l != NULL; l = l->next) + { NautilusFile *file; - gint selection_count; - gboolean show_app; - gboolean show_run; - gboolean show_extract; - gboolean item_opens_in_view; - gchar *item_label; - GAppInfo *app; - GIcon *app_icon; - GMenuItem *menu_item; - gboolean show_mount; - gboolean show_unmount; - gboolean show_eject; - gboolean show_start; - gboolean show_stop; - gboolean show_detect_media; - GDriveStartStopType start_stop_type; - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - selection_count = g_list_length (selection); - - show_mount = (selection != NULL); - show_unmount = (selection != NULL); - show_eject = (selection != NULL); - show_start = (selection != NULL && selection_count == 1); - show_stop = (selection != NULL && selection_count == 1); - show_detect_media = (selection != NULL && selection_count == 1); - start_stop_type = G_DRIVE_START_STOP_TYPE_UNKNOWN; - item_label = g_strdup_printf (ngettext ("New Folder with Selection (%'d Item)", - "New Folder with Selection (%'d Items)", - selection_count), - selection_count); - menu_item = g_menu_item_new (item_label, "view.new-folder-with-selection"); - g_menu_item_set_attribute (menu_item, "hidden-when", "s", "action-disabled"); - nautilus_gmenu_add_item_in_submodel (view->details->selection_menu, - menu_item, - "new-folder-with-selection-section", - FALSE); - g_object_unref (menu_item); - g_free (item_label); + file = NAUTILUS_FILE (l->data); - /* Open With <App> menu item */ - show_extract = show_app = show_run = item_opens_in_view = selection_count != 0; - for (l = selection; l != NULL; l = l->next) { - NautilusFile *file; + if (!nautilus_mime_file_extracts (file)) + { + show_extract = FALSE; + } - file = NAUTILUS_FILE (l->data); + if (!nautilus_mime_file_opens_in_external_app (file)) + { + show_app = FALSE; + } - if (!nautilus_mime_file_extracts (file)) { - show_extract = FALSE; - } + if (!nautilus_mime_file_launches (file)) + { + show_run = FALSE; + } - if (!nautilus_mime_file_opens_in_external_app (file)) { - show_app = FALSE; - } + if (!nautilus_file_opens_in_view (file)) + { + item_opens_in_view = FALSE; + } - if (!nautilus_mime_file_launches (file)) { - show_run = FALSE; - } + if (!show_extract && !show_app && !show_run && !item_opens_in_view) + { + break; + } + } - if (!nautilus_file_opens_in_view (file)) { - item_opens_in_view = FALSE; - } + item_label = NULL; + app = NULL; + app_icon = NULL; + if (show_app) + { + app = nautilus_mime_get_default_application_for_files (selection); + } - if (!show_extract && !show_app && !show_run && !item_opens_in_view) { - break; - } - } + char *escaped_app; - item_label = NULL; - app = NULL; - app_icon = NULL; - if (show_app) { - app = nautilus_mime_get_default_application_for_files (selection); - } + if (app != NULL) + { + escaped_app = eel_str_double_underscores (g_app_info_get_name (app)); + item_label = g_strdup_printf (_("Open With %s"), escaped_app); - char *escaped_app; + app_icon = g_app_info_get_icon (app); + if (app_icon != NULL) + { + g_object_ref (app_icon); + } + g_free (escaped_app); + g_object_unref (app); + } + else if (show_run) + { + item_label = g_strdup (_("Run")); + } + else if (show_extract) + { + item_label = nautilus_files_view_supports_extract_here (view) ? + g_strdup (_("Extract Here")) : + g_strdup (_("Extract to…")); + } + else + { + item_label = g_strdup (_("Open")); + } + + menu_item = g_menu_item_new (item_label, "view.open-with-default-application"); + if (app_icon != NULL) + { + g_menu_item_set_icon (menu_item, app_icon); + } + + nautilus_gmenu_add_item_in_submodel (view->details->selection_menu, + menu_item, + "open-with-default-application-section", + FALSE); + + g_free (item_label); + g_object_unref (menu_item); + + /* Drives */ + for (l = selection; l != NULL && (show_mount || show_unmount + || show_eject + || show_start || show_stop + || show_detect_media); + l = l->next) + { + gboolean show_mount_one; + gboolean show_unmount_one; + gboolean show_eject_one; + gboolean show_start_one; + gboolean show_stop_one; + gboolean show_detect_media_one; + + file = NAUTILUS_FILE (l->data); + file_should_show_foreach (file, + &show_mount_one, + &show_unmount_one, + &show_eject_one, + &show_start_one, + &show_stop_one, + &show_detect_media_one, + &start_stop_type); + + show_mount &= show_mount_one; + show_unmount &= show_unmount_one; + show_eject &= show_eject_one; + show_start &= show_start_one; + show_stop &= show_stop_one; + show_detect_media &= show_detect_media_one; + } + + if (show_start) + { + switch (start_stop_type) + { + default: + case G_DRIVE_START_STOP_TYPE_UNKNOWN: + case G_DRIVE_START_STOP_TYPE_SHUTDOWN: + { + item_label = _("_Start"); + } + break; - if (app != NULL) { - escaped_app = eel_str_double_underscores (g_app_info_get_name (app)); - item_label = g_strdup_printf (_("Open With %s"), escaped_app); + case G_DRIVE_START_STOP_TYPE_NETWORK: + { + item_label = _("_Connect"); + } + break; - app_icon = g_app_info_get_icon (app); - if (app_icon != NULL) { - g_object_ref (app_icon); + case G_DRIVE_START_STOP_TYPE_MULTIDISK: + { + item_label = _("_Start Multi-disk Drive"); } - g_free (escaped_app); - g_object_unref (app); - } else if (show_run) { - item_label = g_strdup (_("Run")); - } else if (show_extract) { - item_label = nautilus_files_view_supports_extract_here (view) ? - g_strdup (_("Extract Here")) : - g_strdup (_("Extract to…")); - } else { - item_label = g_strdup (_("Open")); - } + break; - menu_item = g_menu_item_new (item_label, "view.open-with-default-application"); - if (app_icon != NULL) - g_menu_item_set_icon (menu_item, app_icon); + case G_DRIVE_START_STOP_TYPE_PASSWORD: + { + item_label = _("U_nlock Drive"); + } + break; + } + menu_item = g_menu_item_new (item_label, "view.start-volume"); nautilus_gmenu_add_item_in_submodel (view->details->selection_menu, menu_item, - "open-with-default-application-section", + "drive-section", FALSE); - - g_free (item_label); g_object_unref (menu_item); + } + + if (show_stop) + { + switch (start_stop_type) + { + default: + case G_DRIVE_START_STOP_TYPE_UNKNOWN: + { + item_label = _("Stop Drive"); + } + break; - /* Drives */ - for (l = selection; l != NULL && (show_mount || show_unmount - || show_eject - || show_start || show_stop - || show_detect_media); - l = l->next) { - gboolean show_mount_one; - gboolean show_unmount_one; - gboolean show_eject_one; - gboolean show_start_one; - gboolean show_stop_one; - gboolean show_detect_media_one; - - file = NAUTILUS_FILE (l->data); - file_should_show_foreach (file, - &show_mount_one, - &show_unmount_one, - &show_eject_one, - &show_start_one, - &show_stop_one, - &show_detect_media_one, - &start_stop_type); - - show_mount &= show_mount_one; - show_unmount &= show_unmount_one; - show_eject &= show_eject_one; - show_start &= show_start_one; - show_stop &= show_stop_one; - show_detect_media &= show_detect_media_one; - } - - if (show_start) { - switch (start_stop_type) { - default: - case G_DRIVE_START_STOP_TYPE_UNKNOWN: - case G_DRIVE_START_STOP_TYPE_SHUTDOWN: - item_label = _("_Start"); - break; - case G_DRIVE_START_STOP_TYPE_NETWORK: - item_label = _("_Connect"); - break; - case G_DRIVE_START_STOP_TYPE_MULTIDISK: - item_label = _("_Start Multi-disk Drive"); - break; - case G_DRIVE_START_STOP_TYPE_PASSWORD: - item_label = _("U_nlock Drive"); - break; + case G_DRIVE_START_STOP_TYPE_SHUTDOWN: + { + item_label = _("_Safely Remove Drive"); } + break; - menu_item = g_menu_item_new (item_label, "view.start-volume"); - nautilus_gmenu_add_item_in_submodel (view->details->selection_menu, - menu_item, - "drive-section", - FALSE); - g_object_unref (menu_item); - } + case G_DRIVE_START_STOP_TYPE_NETWORK: + { + item_label = _("_Disconnect"); + } + break; - if (show_stop) { - switch (start_stop_type) { - default: - case G_DRIVE_START_STOP_TYPE_UNKNOWN: - item_label = _("Stop Drive"); - break; - case G_DRIVE_START_STOP_TYPE_SHUTDOWN: - item_label = _("_Safely Remove Drive"); - break; - case G_DRIVE_START_STOP_TYPE_NETWORK: - item_label = _("_Disconnect"); - break; - case G_DRIVE_START_STOP_TYPE_MULTIDISK: - item_label = _("_Stop Multi-disk Drive"); - break; - case G_DRIVE_START_STOP_TYPE_PASSWORD: - item_label = _("_Lock Drive"); - break; + case G_DRIVE_START_STOP_TYPE_MULTIDISK: + { + item_label = _("_Stop Multi-disk Drive"); } + break; - menu_item = g_menu_item_new (item_label, "view.stop-volume"); - nautilus_gmenu_add_item_in_submodel (view->details->selection_menu, - menu_item, - "drive-section", - FALSE); - g_object_unref (menu_item); + case G_DRIVE_START_STOP_TYPE_PASSWORD: + { + item_label = _("_Lock Drive"); + } + break; } - nautilus_file_list_free (selection); + menu_item = g_menu_item_new (item_label, "view.stop-volume"); + nautilus_gmenu_add_item_in_submodel (view->details->selection_menu, + menu_item, + "drive-section", + FALSE); + g_object_unref (menu_item); + } + + nautilus_file_list_free (selection); - update_scripts_menu (view); + update_scripts_menu (view); } static void update_background_menu (NautilusFilesView *view) { - - if (nautilus_files_view_supports_creating_files (view) && - !showing_recent_directory (view)) - update_templates_menu (view); + if (nautilus_files_view_supports_creating_files (view) && + !showing_recent_directory (view)) + { + update_templates_menu (view); + } } static void real_update_context_menus (NautilusFilesView *view) { - g_clear_object (&view->details->background_menu); - g_clear_object (&view->details->selection_menu); + g_clear_object (&view->details->background_menu); + g_clear_object (&view->details->selection_menu); - GtkBuilder *builder; - builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-files-view-context-menus.ui"); - view->details->background_menu = g_object_ref_sink (G_MENU (gtk_builder_get_object (builder, "background-menu"))); - view->details->selection_menu = g_object_ref_sink (G_MENU (gtk_builder_get_object (builder, "selection-menu"))); - g_object_unref (builder); + GtkBuilder *builder; + builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-files-view-context-menus.ui"); + view->details->background_menu = g_object_ref_sink (G_MENU (gtk_builder_get_object (builder, "background-menu"))); + view->details->selection_menu = g_object_ref_sink (G_MENU (gtk_builder_get_object (builder, "selection-menu"))); + g_object_unref (builder); - update_selection_menu (view); - update_background_menu (view); - update_extensions_menus (view); + update_selection_menu (view); + update_background_menu (view); + update_extensions_menus (view); - nautilus_files_view_update_actions_state (view); + nautilus_files_view_update_actions_state (view); } /* Convenience function to reset the context menus owned by the view and update @@ -7165,54 +7651,58 @@ real_update_context_menus (NautilusFilesView *view) void nautilus_files_view_update_context_menus (NautilusFilesView *view) { - g_assert(NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->update_context_menus (view); + NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->update_context_menus (view); } static void nautilus_files_view_reset_view_menu (NautilusFilesView *view) { - GActionGroup *view_action_group; - GVariant *variant; - GVariantIter iter; - gboolean show_sort_trash, show_sort_access, show_sort_modification, sort_available; - const gchar *hint; - g_autofree gchar *zoom_level_percent = NULL; - - view_action_group = nautilus_files_view_get_action_group (view); - - gtk_widget_set_visible (view->details->visible_columns, - g_action_group_has_action (view_action_group, "visible-columns")); - - sort_available = g_action_group_get_action_enabled (view_action_group, "sort"); - show_sort_trash = show_sort_modification = show_sort_access = FALSE; - gtk_widget_set_visible (view->details->sort_menu, sort_available); - - /* We want to make insensitive available actions but that are not current - * available due to the directory - */ - gtk_widget_set_sensitive (view->details->sort_menu, - !nautilus_files_view_is_empty (view)); - gtk_widget_set_sensitive (view->details->zoom_controls_box, - !nautilus_files_view_is_empty (view)); - - if (sort_available) { - variant = g_action_group_get_action_state_hint (view_action_group, "sort"); - g_variant_iter_init (&iter, variant); - - while (g_variant_iter_next (&iter, "&s", &hint)) { - if (g_strcmp0 (hint, "trash-time") == 0) - show_sort_trash = TRUE; - } - - g_variant_unref (variant); + GActionGroup *view_action_group; + GVariant *variant; + GVariantIter iter; + gboolean show_sort_trash, show_sort_access, show_sort_modification, sort_available; + const gchar *hint; + g_autofree gchar *zoom_level_percent = NULL; + + view_action_group = nautilus_files_view_get_action_group (view); + + gtk_widget_set_visible (view->details->visible_columns, + g_action_group_has_action (view_action_group, "visible-columns")); + + sort_available = g_action_group_get_action_enabled (view_action_group, "sort"); + show_sort_trash = show_sort_modification = show_sort_access = FALSE; + gtk_widget_set_visible (view->details->sort_menu, sort_available); + + /* We want to make insensitive available actions but that are not current + * available due to the directory + */ + gtk_widget_set_sensitive (view->details->sort_menu, + !nautilus_files_view_is_empty (view)); + gtk_widget_set_sensitive (view->details->zoom_controls_box, + !nautilus_files_view_is_empty (view)); + + if (sort_available) + { + variant = g_action_group_get_action_state_hint (view_action_group, "sort"); + g_variant_iter_init (&iter, variant); + + while (g_variant_iter_next (&iter, "&s", &hint)) + { + if (g_strcmp0 (hint, "trash-time") == 0) + { + show_sort_trash = TRUE; + } } - gtk_widget_set_visible (view->details->sort_trash_time, show_sort_trash); + g_variant_unref (variant); + } - zoom_level_percent = g_strdup_printf ("%.0f%%", nautilus_files_view_get_zoom_level_percentage (view) * 100.0); - gtk_label_set_label (GTK_LABEL (view->details->zoom_level_label), zoom_level_percent); + gtk_widget_set_visible (view->details->sort_trash_time, show_sort_trash); + + zoom_level_percent = g_strdup_printf ("%.0f%%", nautilus_files_view_get_zoom_level_percentage (view) * 100.0); + gtk_label_set_label (GTK_LABEL (view->details->zoom_level_label), zoom_level_percent); } /* Convenience function to reset the menus owned by the view but managed on @@ -7223,22 +7713,23 @@ nautilus_files_view_reset_view_menu (NautilusFilesView *view) void nautilus_files_view_update_toolbar_menus (NautilusFilesView *view) { - NautilusWindow *window; + NautilusWindow *window; - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - /* Don't update after destroy (#349551), - * or if we are not active. - */ - if (view->details->slot == NULL || - !view->details->active) { - return; - } - window = nautilus_files_view_get_window (view); - nautilus_window_reset_menus (window); + /* Don't update after destroy (#349551), + * or if we are not active. + */ + if (view->details->slot == NULL || + !view->details->active) + { + return; + } + window = nautilus_files_view_get_window (view); + nautilus_window_reset_menus (window); - nautilus_files_view_update_actions_state (view); - nautilus_files_view_reset_view_menu (view); + nautilus_files_view_update_actions_state (view); + nautilus_files_view_reset_view_menu (view); } /** @@ -7253,16 +7744,16 @@ void nautilus_files_view_pop_up_selection_context_menu (NautilusFilesView *view, GdkEventButton *event) { - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - /* Make the context menu items not flash as they update to proper disabled, - * etc. states by forcing menus to update now. - */ - update_context_menus_if_pending (view); + /* Make the context menu items not flash as they update to proper disabled, + * etc. states by forcing menus to update now. + */ + update_context_menus_if_pending (view); - update_context_menu_position_from_event (view, event); + update_context_menu_position_from_event (view, event); - nautilus_pop_up_context_menu (GTK_WIDGET (view), view->details->selection_menu, event); + nautilus_pop_up_context_menu (GTK_WIDGET (view), view->details->selection_menu, event); } /** @@ -7276,78 +7767,84 @@ void nautilus_files_view_pop_up_background_context_menu (NautilusFilesView *view, GdkEventButton *event) { - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - /* Make the context menu items not flash as they update to proper disabled, - * etc. states by forcing menus to update now. - */ - update_context_menus_if_pending (view); + /* Make the context menu items not flash as they update to proper disabled, + * etc. states by forcing menus to update now. + */ + update_context_menus_if_pending (view); - update_context_menu_position_from_event (view, event); + update_context_menu_position_from_event (view, event); - nautilus_pop_up_context_menu (GTK_WIDGET (view), view->details->background_menu, event); + nautilus_pop_up_context_menu (GTK_WIDGET (view), view->details->background_menu, event); } static void schedule_update_context_menus (NautilusFilesView *view) { - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - /* Don't schedule updates after destroy (#349551), - * or if we are not active. - */ - if (view->details->slot == NULL || - !view->details->active) { - return; - } + /* Don't schedule updates after destroy (#349551), + * or if we are not active. + */ + if (view->details->slot == NULL || + !view->details->active) + { + return; + } - /* Schedule a menu update with the current update interval */ - if (view->details->update_context_menus_timeout_id == 0) { - view->details->update_context_menus_timeout_id - = g_timeout_add (view->details->update_interval, update_context_menus_timeout_callback, view); - } + /* Schedule a menu update with the current update interval */ + if (view->details->update_context_menus_timeout_id == 0) + { + view->details->update_context_menus_timeout_id + = g_timeout_add (view->details->update_interval, update_context_menus_timeout_callback, view); + } } static void remove_update_status_idle_callback (NautilusFilesView *view) { - if (view->details->update_status_idle_id != 0) { - g_source_remove (view->details->update_status_idle_id); - view->details->update_status_idle_id = 0; - } + if (view->details->update_status_idle_id != 0) + { + g_source_remove (view->details->update_status_idle_id); + view->details->update_status_idle_id = 0; + } } static gboolean update_status_idle_callback (gpointer data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = NAUTILUS_FILES_VIEW (data); - nautilus_files_view_display_selection_info (view); - view->details->update_status_idle_id = 0; - return FALSE; + view = NAUTILUS_FILES_VIEW (data); + nautilus_files_view_display_selection_info (view); + view->details->update_status_idle_id = 0; + return FALSE; } static void schedule_update_status (NautilusFilesView *view) { - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - /* Make sure we haven't already destroyed it */ - if (view->details->slot == NULL) { - return; - } + /* Make sure we haven't already destroyed it */ + if (view->details->slot == NULL) + { + return; + } - if (view->details->loading) { - /* Don't update status bar while loading the dir */ - return; - } + if (view->details->loading) + { + /* Don't update status bar while loading the dir */ + return; + } - if (view->details->update_status_idle_id == 0) { - view->details->update_status_idle_id = - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE - 20, - update_status_idle_callback, view, NULL); - } + if (view->details->update_status_idle_id == 0) + { + view->details->update_status_idle_id = + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE - 20, + update_status_idle_callback, view, NULL); + } } /** @@ -7361,49 +7858,53 @@ schedule_update_status (NautilusFilesView *view) void nautilus_files_view_notify_selection_changed (NautilusFilesView *view) { - GtkWindow *window; - GList *selection; + GtkWindow *window; + GList *selection; - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); - window = nautilus_files_view_get_containing_window (view); - DEBUG_FILES (selection, "Selection changed in window %p", window); - nautilus_file_list_free (selection); + selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); + window = nautilus_files_view_get_containing_window (view); + DEBUG_FILES (selection, "Selection changed in window %p", window); + nautilus_file_list_free (selection); - view->details->selection_was_removed = FALSE; + view->details->selection_was_removed = FALSE; - /* Schedule a display of the new selection. */ - if (view->details->display_selection_idle_id == 0) { - view->details->display_selection_idle_id - = g_idle_add (display_selection_info_idle_callback, - view); - } - - if (view->details->batching_selection_level != 0) { - view->details->selection_changed_while_batched = TRUE; - } else { - /* Here is the work we do only when we're not - * batching selection changes. In other words, it's the slower - * stuff that we don't want to slow down selection techniques - * such as rubberband-selecting in icon view. - */ + /* Schedule a display of the new selection. */ + if (view->details->display_selection_idle_id == 0) + { + view->details->display_selection_idle_id + = g_idle_add (display_selection_info_idle_callback, + view); + } + + if (view->details->batching_selection_level != 0) + { + view->details->selection_changed_while_batched = TRUE; + } + else + { + /* Here is the work we do only when we're not + * batching selection changes. In other words, it's the slower + * stuff that we don't want to slow down selection techniques + * such as rubberband-selecting in icon view. + */ - /* Schedule an update of menu item states to match selection */ - schedule_update_context_menus (view); - } + /* Schedule an update of menu item states to match selection */ + schedule_update_context_menus (view); + } } static void file_changed_callback (NautilusFile *file, gpointer callback_data) { - NautilusFilesView *view = NAUTILUS_FILES_VIEW (callback_data); + NautilusFilesView *view = NAUTILUS_FILES_VIEW (callback_data); - schedule_changes (view); + schedule_changes (view); - schedule_update_context_menus (view); - schedule_update_status (view); + schedule_update_context_menus (view); + schedule_update_status (view); } /** @@ -7419,175 +7920,179 @@ static void load_directory (NautilusFilesView *view, NautilusDirectory *directory) { - NautilusFileAttributes attributes; - - g_assert (NAUTILUS_IS_FILES_VIEW (view)); - g_assert (NAUTILUS_IS_DIRECTORY (directory)); - - nautilus_profile_start (NULL); - - nautilus_files_view_stop_loading (view); - g_signal_emit (view, signals[CLEAR], 0); - - view->details->loading = TRUE; - - setup_loading_floating_bar (view); - - /* Update menus when directory is empty, before going to new - * location, so they won't have any false lingering knowledge - * of old selection. - */ - schedule_update_context_menus (view); - - while (view->details->subdirectory_list != NULL) { - nautilus_files_view_remove_subdirectory (view, - view->details->subdirectory_list->data); - } - - /* Avoid freeing it and won't be able to ref it */ - if (view->details->model != directory) { - nautilus_directory_unref (view->details->model); - view->details->model = nautilus_directory_ref (directory); - } - - nautilus_file_unref (view->details->directory_as_file); - view->details->directory_as_file = nautilus_directory_get_corresponding_file (directory); - - g_clear_object (&view->details->location); - view->details->location = nautilus_directory_get_location (directory); - - g_object_notify (G_OBJECT (view), "location"); - g_object_notify (G_OBJECT (view), "is-loading"); - g_object_notify (G_OBJECT (view), "is-searching"); - - /* FIXME bugzilla.gnome.org 45062: In theory, we also need to monitor metadata here (as - * well as doing a call when ready), in case external forces - * change the directory's file metadata. - */ - attributes = - NAUTILUS_FILE_ATTRIBUTE_INFO | - NAUTILUS_FILE_ATTRIBUTE_MOUNT | - NAUTILUS_FILE_ATTRIBUTE_FILESYSTEM_INFO; - view->details->metadata_for_directory_as_file_pending = TRUE; - view->details->metadata_for_files_in_directory_pending = TRUE; - nautilus_file_call_when_ready - (view->details->directory_as_file, - attributes, - metadata_for_directory_as_file_ready_callback, view); - nautilus_directory_call_when_ready - (view->details->model, - attributes, - FALSE, - metadata_for_files_in_directory_ready_callback, view); - - /* If capabilities change, then we need to update the menus - * because of New Folder, and relative emblems. - */ - attributes = - NAUTILUS_FILE_ATTRIBUTE_INFO | - NAUTILUS_FILE_ATTRIBUTE_FILESYSTEM_INFO; - nautilus_file_monitor_add (view->details->directory_as_file, - &view->details->directory_as_file, - attributes); - - view->details->file_changed_handler_id = g_signal_connect - (view->details->directory_as_file, "changed", - G_CALLBACK (file_changed_callback), view); - - nautilus_profile_end (NULL); + NautilusFileAttributes attributes; + + g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (NAUTILUS_IS_DIRECTORY (directory)); + + nautilus_profile_start (NULL); + + nautilus_files_view_stop_loading (view); + g_signal_emit (view, signals[CLEAR], 0); + + view->details->loading = TRUE; + + setup_loading_floating_bar (view); + + /* Update menus when directory is empty, before going to new + * location, so they won't have any false lingering knowledge + * of old selection. + */ + schedule_update_context_menus (view); + + while (view->details->subdirectory_list != NULL) + { + nautilus_files_view_remove_subdirectory (view, + view->details->subdirectory_list->data); + } + + /* Avoid freeing it and won't be able to ref it */ + if (view->details->model != directory) + { + nautilus_directory_unref (view->details->model); + view->details->model = nautilus_directory_ref (directory); + } + + nautilus_file_unref (view->details->directory_as_file); + view->details->directory_as_file = nautilus_directory_get_corresponding_file (directory); + + g_clear_object (&view->details->location); + view->details->location = nautilus_directory_get_location (directory); + + g_object_notify (G_OBJECT (view), "location"); + g_object_notify (G_OBJECT (view), "is-loading"); + g_object_notify (G_OBJECT (view), "is-searching"); + + /* FIXME bugzilla.gnome.org 45062: In theory, we also need to monitor metadata here (as + * well as doing a call when ready), in case external forces + * change the directory's file metadata. + */ + attributes = + NAUTILUS_FILE_ATTRIBUTE_INFO | + NAUTILUS_FILE_ATTRIBUTE_MOUNT | + NAUTILUS_FILE_ATTRIBUTE_FILESYSTEM_INFO; + view->details->metadata_for_directory_as_file_pending = TRUE; + view->details->metadata_for_files_in_directory_pending = TRUE; + nautilus_file_call_when_ready + (view->details->directory_as_file, + attributes, + metadata_for_directory_as_file_ready_callback, view); + nautilus_directory_call_when_ready + (view->details->model, + attributes, + FALSE, + metadata_for_files_in_directory_ready_callback, view); + + /* If capabilities change, then we need to update the menus + * because of New Folder, and relative emblems. + */ + attributes = + NAUTILUS_FILE_ATTRIBUTE_INFO | + NAUTILUS_FILE_ATTRIBUTE_FILESYSTEM_INFO; + nautilus_file_monitor_add (view->details->directory_as_file, + &view->details->directory_as_file, + attributes); + + view->details->file_changed_handler_id = g_signal_connect + (view->details->directory_as_file, "changed", + G_CALLBACK (file_changed_callback), view); + + nautilus_profile_end (NULL); } static void finish_loading (NautilusFilesView *view) { - NautilusFileAttributes attributes; + NautilusFileAttributes attributes; - nautilus_profile_start (NULL); + nautilus_profile_start (NULL); - /* Tell interested parties that we've begun loading this directory now. - * Subclasses use this to know that the new metadata is now available. - */ - nautilus_profile_start ("BEGIN_LOADING"); - g_signal_emit (view, signals[BEGIN_LOADING], 0); - nautilus_profile_end ("BEGIN_LOADING"); - - nautilus_files_view_check_empty_states (view); + /* Tell interested parties that we've begun loading this directory now. + * Subclasses use this to know that the new metadata is now available. + */ + nautilus_profile_start ("BEGIN_LOADING"); + g_signal_emit (view, signals[BEGIN_LOADING], 0); + nautilus_profile_end ("BEGIN_LOADING"); - if (nautilus_directory_are_all_files_seen (view->details->model)) { - /* Unschedule a pending update and schedule a new one with the minimal - * update interval. This gives the view a short chance at gathering the - * (cached) deep counts. - */ - unschedule_display_of_pending_files (view); - schedule_timeout_display_of_pending_files (view, UPDATE_INTERVAL_MIN); - } + nautilus_files_view_check_empty_states (view); - /* Start loading. */ - - /* Connect handlers to learn about loading progress. */ - view->details->done_loading_handler_id = g_signal_connect - (view->details->model, "done-loading", - G_CALLBACK (done_loading_callback), view); - view->details->load_error_handler_id = g_signal_connect - (view->details->model, "load-error", - G_CALLBACK (load_error_callback), view); - - /* Monitor the things needed to get the right icon. Also - * monitor a directory's item count because the "size" - * attribute is based on that, and the file's metadata - * and possible custom name. + if (nautilus_directory_are_all_files_seen (view->details->model)) + { + /* Unschedule a pending update and schedule a new one with the minimal + * update interval. This gives the view a short chance at gathering the + * (cached) deep counts. */ - attributes = - NAUTILUS_FILE_ATTRIBUTES_FOR_ICON | - NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT | - NAUTILUS_FILE_ATTRIBUTE_INFO | - NAUTILUS_FILE_ATTRIBUTE_LINK_INFO | - NAUTILUS_FILE_ATTRIBUTE_MOUNT | - NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO; - - nautilus_directory_file_monitor_add (view->details->model, - &view->details->model, - view->details->show_hidden_files, - attributes, - files_added_callback, view); - - view->details->files_added_handler_id = g_signal_connect - (view->details->model, "files-added", - G_CALLBACK (files_added_callback), view); - view->details->files_changed_handler_id = g_signal_connect - (view->details->model, "files-changed", - G_CALLBACK (files_changed_callback), view); - - nautilus_profile_end (NULL); + unschedule_display_of_pending_files (view); + schedule_timeout_display_of_pending_files (view, UPDATE_INTERVAL_MIN); + } + + /* Start loading. */ + + /* Connect handlers to learn about loading progress. */ + view->details->done_loading_handler_id = g_signal_connect + (view->details->model, "done-loading", + G_CALLBACK (done_loading_callback), view); + view->details->load_error_handler_id = g_signal_connect + (view->details->model, "load-error", + G_CALLBACK (load_error_callback), view); + + /* Monitor the things needed to get the right icon. Also + * monitor a directory's item count because the "size" + * attribute is based on that, and the file's metadata + * and possible custom name. + */ + attributes = + NAUTILUS_FILE_ATTRIBUTES_FOR_ICON | + NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT | + NAUTILUS_FILE_ATTRIBUTE_INFO | + NAUTILUS_FILE_ATTRIBUTE_LINK_INFO | + NAUTILUS_FILE_ATTRIBUTE_MOUNT | + NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO; + + nautilus_directory_file_monitor_add (view->details->model, + &view->details->model, + view->details->show_hidden_files, + attributes, + files_added_callback, view); + + view->details->files_added_handler_id = g_signal_connect + (view->details->model, "files-added", + G_CALLBACK (files_added_callback), view); + view->details->files_changed_handler_id = g_signal_connect + (view->details->model, "files-changed", + G_CALLBACK (files_changed_callback), view); + + nautilus_profile_end (NULL); } static void finish_loading_if_all_metadata_loaded (NautilusFilesView *view) { - if (!view->details->metadata_for_directory_as_file_pending && - !view->details->metadata_for_files_in_directory_pending) { - finish_loading (view); - } + if (!view->details->metadata_for_directory_as_file_pending && + !view->details->metadata_for_files_in_directory_pending) + { + finish_loading (view); + } } static void metadata_for_directory_as_file_ready_callback (NautilusFile *file, gpointer callback_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = callback_data; + view = callback_data; - g_assert (NAUTILUS_IS_FILES_VIEW (view)); - g_assert (view->details->directory_as_file == file); - g_assert (view->details->metadata_for_directory_as_file_pending); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (view->details->directory_as_file == file); + g_assert (view->details->metadata_for_directory_as_file_pending); - nautilus_profile_start (NULL); + nautilus_profile_start (NULL); - view->details->metadata_for_directory_as_file_pending = FALSE; + view->details->metadata_for_directory_as_file_pending = FALSE; - finish_loading_if_all_metadata_loaded (view); - nautilus_profile_end (NULL); + finish_loading_if_all_metadata_loaded (view); + nautilus_profile_end (NULL); } static void @@ -7595,79 +8100,81 @@ metadata_for_files_in_directory_ready_callback (NautilusDirectory *directory, GList *files, gpointer callback_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = callback_data; + view = callback_data; - g_assert (NAUTILUS_IS_FILES_VIEW (view)); - g_assert (view->details->model == directory); - g_assert (view->details->metadata_for_files_in_directory_pending); + g_assert (NAUTILUS_IS_FILES_VIEW (view)); + g_assert (view->details->model == directory); + g_assert (view->details->metadata_for_files_in_directory_pending); - nautilus_profile_start (NULL); + nautilus_profile_start (NULL); - view->details->metadata_for_files_in_directory_pending = FALSE; + view->details->metadata_for_files_in_directory_pending = FALSE; - finish_loading_if_all_metadata_loaded (view); - nautilus_profile_end (NULL); + finish_loading_if_all_metadata_loaded (view); + nautilus_profile_end (NULL); } static void disconnect_handler (GObject *object, guint *id) { - if (*id != 0) { - g_signal_handler_disconnect (object, *id); - *id = 0; - } + if (*id != 0) + { + g_signal_handler_disconnect (object, *id); + *id = 0; + } } static void disconnect_directory_handler (NautilusFilesView *view, guint *id) { - disconnect_handler (G_OBJECT (view->details->model), id); + disconnect_handler (G_OBJECT (view->details->model), id); } static void disconnect_directory_as_file_handler (NautilusFilesView *view, guint *id) { - disconnect_handler (G_OBJECT (view->details->directory_as_file), id); + disconnect_handler (G_OBJECT (view->details->directory_as_file), id); } static void disconnect_model_handlers (NautilusFilesView *view) { - if (view->details->model == NULL) { - return; - } - disconnect_directory_handler (view, &view->details->files_added_handler_id); - disconnect_directory_handler (view, &view->details->files_changed_handler_id); - disconnect_directory_handler (view, &view->details->done_loading_handler_id); - disconnect_directory_handler (view, &view->details->load_error_handler_id); - disconnect_directory_as_file_handler (view, &view->details->file_changed_handler_id); - nautilus_file_cancel_call_when_ready (view->details->directory_as_file, - metadata_for_directory_as_file_ready_callback, - view); - nautilus_directory_cancel_callback (view->details->model, - metadata_for_files_in_directory_ready_callback, - view); - nautilus_directory_file_monitor_remove (view->details->model, - &view->details->model); - nautilus_file_monitor_remove (view->details->directory_as_file, - &view->details->directory_as_file); + if (view->details->model == NULL) + { + return; + } + disconnect_directory_handler (view, &view->details->files_added_handler_id); + disconnect_directory_handler (view, &view->details->files_changed_handler_id); + disconnect_directory_handler (view, &view->details->done_loading_handler_id); + disconnect_directory_handler (view, &view->details->load_error_handler_id); + disconnect_directory_as_file_handler (view, &view->details->file_changed_handler_id); + nautilus_file_cancel_call_when_ready (view->details->directory_as_file, + metadata_for_directory_as_file_ready_callback, + view); + nautilus_directory_cancel_callback (view->details->model, + metadata_for_files_in_directory_ready_callback, + view); + nautilus_directory_file_monitor_remove (view->details->model, + &view->details->model); + nautilus_file_monitor_remove (view->details->directory_as_file, + &view->details->directory_as_file); } static void nautilus_files_view_select_file (NautilusFilesView *view, NautilusFile *file) { - GList file_list; + GList file_list; - file_list.data = file; - file_list.next = NULL; - file_list.prev = NULL; - nautilus_files_view_call_set_selection (view, &file_list); + file_list.data = file; + file_list.next = NULL; + file_list.prev = NULL; + nautilus_files_view_call_set_selection (view, &file_list); } static gboolean @@ -7675,7 +8182,7 @@ remove_all (gpointer key, gpointer value, gpointer callback_data) { - return TRUE; + return TRUE; } /** @@ -7688,62 +8195,65 @@ remove_all (gpointer key, void nautilus_files_view_stop_loading (NautilusFilesView *view) { - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - unschedule_display_of_pending_files (view); - reset_update_interval (view); + unschedule_display_of_pending_files (view); + reset_update_interval (view); - /* Free extra undisplayed files */ - file_and_directory_list_free (view->details->new_added_files); - view->details->new_added_files = NULL; + /* Free extra undisplayed files */ + file_and_directory_list_free (view->details->new_added_files); + view->details->new_added_files = NULL; - file_and_directory_list_free (view->details->new_changed_files); - view->details->new_changed_files = NULL; + file_and_directory_list_free (view->details->new_changed_files); + view->details->new_changed_files = NULL; - g_hash_table_foreach_remove (view->details->non_ready_files, remove_all, NULL); + g_hash_table_foreach_remove (view->details->non_ready_files, remove_all, NULL); - file_and_directory_list_free (view->details->old_added_files); - view->details->old_added_files = NULL; + file_and_directory_list_free (view->details->old_added_files); + view->details->old_added_files = NULL; - file_and_directory_list_free (view->details->old_changed_files); - view->details->old_changed_files = NULL; + file_and_directory_list_free (view->details->old_changed_files); + view->details->old_changed_files = NULL; - g_list_free_full (view->details->pending_selection, g_object_unref); - view->details->pending_selection = NULL; + g_list_free_full (view->details->pending_selection, g_object_unref); + view->details->pending_selection = NULL; - done_loading (view, FALSE); + done_loading (view, FALSE); - disconnect_model_handlers (view); + disconnect_model_handlers (view); } gboolean nautilus_files_view_is_editable (NautilusFilesView *view) { - NautilusDirectory *directory; + NautilusDirectory *directory; - directory = nautilus_files_view_get_model (view); + directory = nautilus_files_view_get_model (view); - if (directory != NULL) { - return nautilus_directory_is_editable (directory); - } + if (directory != NULL) + { + return nautilus_directory_is_editable (directory); + } - return TRUE; + return TRUE; } static gboolean nautilus_files_view_is_read_only (NautilusFilesView *view) { - NautilusFile *file; + NautilusFile *file; - if (!nautilus_files_view_is_editable (view)) { - return TRUE; - } + if (!nautilus_files_view_is_editable (view)) + { + return TRUE; + } - file = nautilus_files_view_get_directory_as_file (view); - if (file != NULL) { - return !nautilus_file_can_write (file); - } - return FALSE; + file = nautilus_files_view_get_directory_as_file (view); + if (file != NULL) + { + return !nautilus_file_can_write (file); + } + return FALSE; } /** @@ -7756,47 +8266,49 @@ gboolean nautilus_files_view_should_show_file (NautilusFilesView *view, NautilusFile *file) { - return nautilus_file_should_show (file, - view->details->show_hidden_files, - view->details->show_foreign_files); + return nautilus_file_should_show (file, + view->details->show_hidden_files, + view->details->show_foreign_files); } static gboolean real_using_manual_layout (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), FALSE); - return FALSE; + return FALSE; } void nautilus_files_view_ignore_hidden_file_preferences (NautilusFilesView *view) { - g_return_if_fail (view->details->model == NULL); + g_return_if_fail (view->details->model == NULL); - if (view->details->ignore_hidden_file_preferences) { - return; - } + if (view->details->ignore_hidden_file_preferences) + { + return; + } - view->details->show_hidden_files = FALSE; - view->details->ignore_hidden_file_preferences = TRUE; + view->details->show_hidden_files = FALSE; + view->details->ignore_hidden_file_preferences = TRUE; } void nautilus_files_view_set_show_foreign (NautilusFilesView *view, gboolean show_foreign) { - view->details->show_foreign_files = show_foreign; + view->details->show_foreign_files = show_foreign; } char * nautilus_files_view_get_uri (NautilusFilesView *view) { - g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); - if (view->details->model == NULL) { - return NULL; - } - return nautilus_directory_get_uri (view->details->model); + g_return_val_if_fail (NAUTILUS_IS_FILES_VIEW (view), NULL); + if (view->details->model == NULL) + { + return NULL; + } + return nautilus_directory_get_uri (view->details->model); } void @@ -7808,66 +8320,71 @@ nautilus_files_view_move_copy_items (NautilusFilesView *view, int x, int y) { - NautilusFile *target_file; + NautilusFile *target_file; - g_assert (relative_item_points == NULL - || relative_item_points->len == 0 - || g_list_length ((GList *)item_uris) == relative_item_points->len); + g_assert (relative_item_points == NULL + || relative_item_points->len == 0 + || g_list_length ((GList *) item_uris) == relative_item_points->len); - /* add the drop location to the icon offsets */ - offset_drop_points (relative_item_points, x, y); + /* add the drop location to the icon offsets */ + offset_drop_points (relative_item_points, x, y); - target_file = nautilus_file_get_existing_by_uri (target_uri); - /* special-case "command:" here instead of starting a move/copy */ - if (target_file != NULL && nautilus_file_is_launcher (target_file)) { - nautilus_file_unref (target_file); - nautilus_launch_desktop_file ( - gtk_widget_get_screen (GTK_WIDGET (view)), - target_uri, item_uris, - nautilus_files_view_get_containing_window (view)); - return; - } else if (copy_action == GDK_ACTION_COPY && - nautilus_is_file_roller_installed () && - target_file != NULL && - nautilus_file_is_archive (target_file)) { - char *command, *quoted_uri, *tmp; - const GList *l; - GdkScreen *screen; + target_file = nautilus_file_get_existing_by_uri (target_uri); + /* special-case "command:" here instead of starting a move/copy */ + if (target_file != NULL && nautilus_file_is_launcher (target_file)) + { + nautilus_file_unref (target_file); + nautilus_launch_desktop_file ( + gtk_widget_get_screen (GTK_WIDGET (view)), + target_uri, item_uris, + nautilus_files_view_get_containing_window (view)); + return; + } + else if (copy_action == GDK_ACTION_COPY && + nautilus_is_file_roller_installed () && + target_file != NULL && + nautilus_file_is_archive (target_file)) + { + char *command, *quoted_uri, *tmp; + const GList *l; + GdkScreen *screen; - /* Handle dropping onto a file-roller archiver file, instead of starting a move/copy */ + /* Handle dropping onto a file-roller archiver file, instead of starting a move/copy */ - nautilus_file_unref (target_file); + nautilus_file_unref (target_file); - quoted_uri = g_shell_quote (target_uri); - command = g_strconcat ("file-roller -a ", quoted_uri, NULL); - g_free (quoted_uri); + quoted_uri = g_shell_quote (target_uri); + command = g_strconcat ("file-roller -a ", quoted_uri, NULL); + g_free (quoted_uri); - for (l = item_uris; l != NULL; l = l->next) { - quoted_uri = g_shell_quote ((char *) l->data); + for (l = item_uris; l != NULL; l = l->next) + { + quoted_uri = g_shell_quote ((char *) l->data); - tmp = g_strconcat (command, " ", quoted_uri, NULL); - g_free (command); - command = tmp; + tmp = g_strconcat (command, " ", quoted_uri, NULL); + g_free (command); + command = tmp; - g_free (quoted_uri); - } + g_free (quoted_uri); + } - screen = gtk_widget_get_screen (GTK_WIDGET (view)); - if (screen == NULL) { - screen = gdk_screen_get_default (); - } + screen = gtk_widget_get_screen (GTK_WIDGET (view)); + if (screen == NULL) + { + screen = gdk_screen_get_default (); + } - nautilus_launch_application_from_command (screen, command, FALSE, NULL); - g_free (command); + nautilus_launch_application_from_command (screen, command, FALSE, NULL); + g_free (command); - return; - } - nautilus_file_unref (target_file); + return; + } + nautilus_file_unref (target_file); - nautilus_file_operations_copy_move - (item_uris, relative_item_points, - target_uri, copy_action, GTK_WIDGET (view), - copy_move_done_callback, pre_copy_move (view)); + nautilus_file_operations_copy_move + (item_uris, relative_item_points, + target_uri, copy_action, GTK_WIDGET (view), + copy_move_done_callback, pre_copy_move (view)); } static void @@ -7875,34 +8392,36 @@ nautilus_files_view_trash_state_changed_callback (NautilusTrashMonitor *trash_mo gboolean state, gpointer callback_data) { - NautilusFilesView *view; + NautilusFilesView *view; - view = (NautilusFilesView *) callback_data; - g_assert (NAUTILUS_IS_FILES_VIEW (view)); + view = (NautilusFilesView *) callback_data; + g_assert (NAUTILUS_IS_FILES_VIEW (view)); - schedule_update_context_menus (view); + schedule_update_context_menus (view); } void nautilus_files_view_start_batching_selection_changes (NautilusFilesView *view) { - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - ++view->details->batching_selection_level; - view->details->selection_changed_while_batched = FALSE; + ++view->details->batching_selection_level; + view->details->selection_changed_while_batched = FALSE; } void nautilus_files_view_stop_batching_selection_changes (NautilusFilesView *view) { - g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); - g_return_if_fail (view->details->batching_selection_level > 0); + g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view)); + g_return_if_fail (view->details->batching_selection_level > 0); - if (--view->details->batching_selection_level == 0) { - if (view->details->selection_changed_while_batched) { - nautilus_files_view_notify_selection_changed (view); - } + if (--view->details->batching_selection_level == 0) + { + if (view->details->selection_changed_while_batched) + { + nautilus_files_view_notify_selection_changed (view); } + } } static void @@ -7911,33 +8430,43 @@ nautilus_files_view_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - NautilusFilesView *view = NAUTILUS_FILES_VIEW (object); + NautilusFilesView *view = NAUTILUS_FILES_VIEW (object); - switch (prop_id) { + switch (prop_id) + { case PROP_ICON: + { g_value_set_object (value, nautilus_view_get_icon (NAUTILUS_VIEW (view))); - break; + } + break; case PROP_IS_LOADING: + { g_value_set_boolean (value, nautilus_view_is_loading (NAUTILUS_VIEW (view))); - break; + } + break; case PROP_IS_SEARCH: + { g_value_set_boolean (value, nautilus_view_is_searching (NAUTILUS_VIEW (view))); - break; + } + break; case PROP_LOCATION: + { g_value_set_object (value, nautilus_view_get_location (NAUTILUS_VIEW (view))); - break; + } + break; case PROP_SEARCH_QUERY: + { g_value_set_object (value, view->details->search_query); - break; + } + break; default: - g_assert_not_reached (); - - } + g_assert_not_reached (); + } } static void @@ -7946,13 +8475,15 @@ nautilus_files_view_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - NautilusFilesView *directory_view; - NautilusWindowSlot *slot; + NautilusFilesView *directory_view; + NautilusWindowSlot *slot; - directory_view = NAUTILUS_FILES_VIEW (object); + directory_view = NAUTILUS_FILES_VIEW (object); - switch (prop_id) { + switch (prop_id) + { case PROP_WINDOW_SLOT: + { g_assert (directory_view->details->slot == NULL); slot = NAUTILUS_WINDOW_SLOT (g_value_get_object (value)); @@ -7964,23 +8495,33 @@ nautilus_files_view_set_property (GObject *object, g_signal_connect_object (directory_view->details->slot, "inactive", G_CALLBACK (slot_inactive), directory_view, 0); - break; + } + break; + case PROP_SUPPORTS_ZOOMING: + { directory_view->details->supports_zooming = g_value_get_boolean (value); - break; + } + break; case PROP_LOCATION: + { nautilus_view_set_location (NAUTILUS_VIEW (directory_view), g_value_get_object (value)); - break; + } + break; case PROP_SEARCH_QUERY: + { nautilus_view_set_search_query (NAUTILUS_VIEW (directory_view), g_value_get_object (value)); - break; + } + break; default: + { G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + } + break; + } } @@ -7988,53 +8529,68 @@ gboolean nautilus_files_view_handle_scroll_event (NautilusFilesView *directory_view, GdkEventScroll *event) { - static gdouble total_delta_y = 0; - gdouble delta_x, delta_y; + static gdouble total_delta_y = 0; + gdouble delta_x, delta_y; + + if (event->state & GDK_CONTROL_MASK) + { + switch (event->direction) + { + case GDK_SCROLL_UP: + { + /* Zoom In */ + nautilus_files_view_bump_zoom_level (directory_view, 1); + return TRUE; + } - if (event->state & GDK_CONTROL_MASK) { - switch (event->direction) { - case GDK_SCROLL_UP: - /* Zoom In */ - nautilus_files_view_bump_zoom_level (directory_view, 1); - return TRUE; + case GDK_SCROLL_DOWN: + { + /* Zoom Out */ + nautilus_files_view_bump_zoom_level (directory_view, -1); + return TRUE; + } + + case GDK_SCROLL_SMOOTH: + { + gdk_event_get_scroll_deltas ((const GdkEvent *) event, + &delta_x, &delta_y); - case GDK_SCROLL_DOWN: - /* Zoom Out */ + /* try to emulate a normal scrolling event by summing deltas */ + total_delta_y += delta_y; + + if (total_delta_y >= 1) + { + total_delta_y = 0; + /* emulate scroll down */ nautilus_files_view_bump_zoom_level (directory_view, -1); return TRUE; + } + else if (total_delta_y <= -1) + { + total_delta_y = 0; + /* emulate scroll up */ + nautilus_files_view_bump_zoom_level (directory_view, 1); + return TRUE; + } + else + { + /* eat event */ + return TRUE; + } + } - case GDK_SCROLL_SMOOTH: - gdk_event_get_scroll_deltas ((const GdkEvent *) event, - &delta_x, &delta_y); - - /* try to emulate a normal scrolling event by summing deltas */ - total_delta_y += delta_y; - - if (total_delta_y >= 1) { - total_delta_y = 0; - /* emulate scroll down */ - nautilus_files_view_bump_zoom_level (directory_view, -1); - return TRUE; - } else if (total_delta_y <= - 1) { - total_delta_y = 0; - /* emulate scroll up */ - nautilus_files_view_bump_zoom_level (directory_view, 1); - return TRUE; - } else { - /* eat event */ - return TRUE; - } - - case GDK_SCROLL_LEFT: - case GDK_SCROLL_RIGHT: - break; - - default: - g_assert_not_reached (); + case GDK_SCROLL_LEFT: + case GDK_SCROLL_RIGHT: + { } + break; + + default: + g_assert_not_reached (); } + } - return FALSE; + return FALSE; } /* handle Shift+Scroll, which will cause a zoom-in/out */ @@ -8042,14 +8598,15 @@ static gboolean nautilus_files_view_scroll_event (GtkWidget *widget, GdkEventScroll *event) { - NautilusFilesView *directory_view; + NautilusFilesView *directory_view; - directory_view = NAUTILUS_FILES_VIEW (widget); - if (nautilus_files_view_handle_scroll_event (directory_view, event)) { - return TRUE; - } + directory_view = NAUTILUS_FILES_VIEW (widget); + if (nautilus_files_view_handle_scroll_event (directory_view, event)) + { + return TRUE; + } - return FALSE; + return FALSE; } @@ -8059,7 +8616,7 @@ action_reload_enabled_changed (GActionGroup *action_group, gboolean enabled, NautilusFilesView *view) { - gtk_widget_set_visible (view->details->reload, enabled); + gtk_widget_set_visible (view->details->reload, enabled); } static void @@ -8068,106 +8625,116 @@ action_stop_enabled_changed (GActionGroup *action_group, gboolean enabled, NautilusFilesView *view) { - gtk_widget_set_visible (view->details->stop, enabled); + gtk_widget_set_visible (view->details->stop, enabled); } static void nautilus_files_view_parent_set (GtkWidget *widget, GtkWidget *old_parent) { - NautilusWindow *window; - NautilusFilesView *view; - GtkWidget *parent; - - view = NAUTILUS_FILES_VIEW (widget); - - parent = gtk_widget_get_parent (widget); - window = nautilus_files_view_get_window (view); - g_assert (parent == NULL || old_parent == NULL); - - if (GTK_WIDGET_CLASS (nautilus_files_view_parent_class)->parent_set != NULL) { - GTK_WIDGET_CLASS (nautilus_files_view_parent_class)->parent_set (widget, old_parent); - } - - if (view->details->stop_signal_handler > 0) { - g_signal_handler_disconnect (window, view->details->stop_signal_handler); - view->details->stop_signal_handler = 0; - } - - if (view->details->reload_signal_handler > 0) { - g_signal_handler_disconnect (window, view->details->reload_signal_handler); - view->details->reload_signal_handler = 0; - } - - if (parent != NULL) { - g_assert (old_parent == NULL); - - if (view->details->slot == nautilus_window_get_active_slot (window)) { - view->details->active = TRUE; - gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), - "view", - G_ACTION_GROUP (view->details->view_action_group)); - } - - view->details->stop_signal_handler = - g_signal_connect (window, - "action-enabled-changed::stop", - G_CALLBACK (action_stop_enabled_changed), - view); - view->details->reload_signal_handler = - g_signal_connect (window, - "action-enabled-changed::reload", - G_CALLBACK (action_reload_enabled_changed), - view); - } else { - remove_update_context_menus_timeout_callback (view); - /* Only remove the action group if it matchs the current view - * action group. If not, we can remove an action group set by - * a different view i.e. if the slot_active function is called - * before this one - */ - if (gtk_widget_get_action_group (GTK_WIDGET (window), "view") == - view->details->view_action_group) { - gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), - "view", - NULL); - - } + NautilusWindow *window; + NautilusFilesView *view; + GtkWidget *parent; + + view = NAUTILUS_FILES_VIEW (widget); + + parent = gtk_widget_get_parent (widget); + window = nautilus_files_view_get_window (view); + g_assert (parent == NULL || old_parent == NULL); + + if (GTK_WIDGET_CLASS (nautilus_files_view_parent_class)->parent_set != NULL) + { + GTK_WIDGET_CLASS (nautilus_files_view_parent_class)->parent_set (widget, old_parent); + } + + if (view->details->stop_signal_handler > 0) + { + g_signal_handler_disconnect (window, view->details->stop_signal_handler); + view->details->stop_signal_handler = 0; + } + + if (view->details->reload_signal_handler > 0) + { + g_signal_handler_disconnect (window, view->details->reload_signal_handler); + view->details->reload_signal_handler = 0; + } + + if (parent != NULL) + { + g_assert (old_parent == NULL); + + if (view->details->slot == nautilus_window_get_active_slot (window)) + { + view->details->active = TRUE; + gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), + "view", + G_ACTION_GROUP (view->details->view_action_group)); + } + + view->details->stop_signal_handler = + g_signal_connect (window, + "action-enabled-changed::stop", + G_CALLBACK (action_stop_enabled_changed), + view); + view->details->reload_signal_handler = + g_signal_connect (window, + "action-enabled-changed::reload", + G_CALLBACK (action_reload_enabled_changed), + view); + } + else + { + remove_update_context_menus_timeout_callback (view); + /* Only remove the action group if it matchs the current view + * action group. If not, we can remove an action group set by + * a different view i.e. if the slot_active function is called + * before this one + */ + if (gtk_widget_get_action_group (GTK_WIDGET (window), "view") == + view->details->view_action_group) + { + gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), + "view", + NULL); } + } } static gboolean nautilus_files_view_key_press_event (GtkWidget *widget, GdkEventKey *event) { - NautilusFilesView *view; - gint i; + NautilusFilesView *view; + gint i; - view = NAUTILUS_FILES_VIEW (widget); + view = NAUTILUS_FILES_VIEW (widget); - for (i = 0; i < G_N_ELEMENTS (extra_view_keybindings); i++) { - if (extra_view_keybindings[i].keyval == event->keyval) { - GAction *action; + for (i = 0; i < G_N_ELEMENTS (extra_view_keybindings); i++) + { + if (extra_view_keybindings[i].keyval == event->keyval) + { + GAction *action; - action = g_action_map_lookup_action (G_ACTION_MAP (view->details->view_action_group), - extra_view_keybindings[i].action); + action = g_action_map_lookup_action (G_ACTION_MAP (view->details->view_action_group), + extra_view_keybindings[i].action); - if (g_action_get_enabled (action)) { - g_action_activate (action, NULL); - return GDK_EVENT_STOP; - } + if (g_action_get_enabled (action)) + { + g_action_activate (action, NULL); + return GDK_EVENT_STOP; + } - break; - } + break; } + } - return GDK_EVENT_PROPAGATE; + return GDK_EVENT_PROPAGATE; } -static NautilusQuery* +static NautilusQuery * nautilus_files_view_get_search_query (NautilusView *view) { - return NAUTILUS_FILES_VIEW (view)->details->search_query; + return NAUTILUS_FILES_VIEW (view)->details->search_query; } static void @@ -8175,492 +8742,521 @@ set_search_query_internal (NautilusFilesView *files_view, NautilusQuery *query, NautilusDirectory *base_model) { - GFile *location; + GFile *location; - location = NULL; - - g_set_object (&files_view->details->search_query, query); - g_object_notify (G_OBJECT (files_view), "search-query"); - - if (!nautilus_query_is_empty (query)) { - if (nautilus_view_is_searching (NAUTILUS_VIEW (files_view))) { - /* - * Reuse the search directory and reload it. - */ - nautilus_search_directory_set_query (NAUTILUS_SEARCH_DIRECTORY (files_view->details->model), query); - /* It's important to use load_directory instead of set_location, - * since the location is already correct, however we need - * to reload the directory with the new query set. But - * set_location has a check for wheter the location is a - * search directory, so setting the location to a search - * directory when is already serching will enter a loop. - */ - load_directory (files_view, files_view->details->model); - } else { - NautilusDirectory *directory; - gchar *uri; - - uri = nautilus_search_directory_generate_new_uri (); - location = g_file_new_for_uri (uri); - - directory = nautilus_directory_get (location); - g_assert (NAUTILUS_IS_SEARCH_DIRECTORY (directory)); - nautilus_search_directory_set_base_model (NAUTILUS_SEARCH_DIRECTORY (directory), base_model); - nautilus_search_directory_set_query (NAUTILUS_SEARCH_DIRECTORY (directory), query); - - load_directory (files_view, directory); - - g_object_notify (G_OBJECT (files_view), "is-searching"); - - nautilus_directory_unref (directory); - g_free (uri); - } - } else { - if (nautilus_view_is_searching (NAUTILUS_VIEW (files_view))) { - location = nautilus_directory_get_location (base_model); + location = NULL; - nautilus_view_set_location (NAUTILUS_VIEW (files_view), location); - } + g_set_object (&files_view->details->search_query, query); + g_object_notify (G_OBJECT (files_view), "search-query"); + + if (!nautilus_query_is_empty (query)) + { + if (nautilus_view_is_searching (NAUTILUS_VIEW (files_view))) + { + /* + * Reuse the search directory and reload it. + */ + nautilus_search_directory_set_query (NAUTILUS_SEARCH_DIRECTORY (files_view->details->model), query); + /* It's important to use load_directory instead of set_location, + * since the location is already correct, however we need + * to reload the directory with the new query set. But + * set_location has a check for wheter the location is a + * search directory, so setting the location to a search + * directory when is already serching will enter a loop. + */ + load_directory (files_view, files_view->details->model); + } + else + { + NautilusDirectory *directory; + gchar *uri; + + uri = nautilus_search_directory_generate_new_uri (); + location = g_file_new_for_uri (uri); + + directory = nautilus_directory_get (location); + g_assert (NAUTILUS_IS_SEARCH_DIRECTORY (directory)); + nautilus_search_directory_set_base_model (NAUTILUS_SEARCH_DIRECTORY (directory), base_model); + nautilus_search_directory_set_query (NAUTILUS_SEARCH_DIRECTORY (directory), query); + + load_directory (files_view, directory); + + g_object_notify (G_OBJECT (files_view), "is-searching"); + + nautilus_directory_unref (directory); + g_free (uri); + } + } + else + { + if (nautilus_view_is_searching (NAUTILUS_VIEW (files_view))) + { + location = nautilus_directory_get_location (base_model); + + nautilus_view_set_location (NAUTILUS_VIEW (files_view), location); } - g_clear_object (&location); + } + g_clear_object (&location); } static void nautilus_files_view_set_search_query (NautilusView *view, NautilusQuery *query) { - NautilusDirectory *base_model; - NautilusFilesView *files_view; + NautilusDirectory *base_model; + NautilusFilesView *files_view; - files_view = NAUTILUS_FILES_VIEW (view); + files_view = NAUTILUS_FILES_VIEW (view); - if (nautilus_view_is_searching (view)) { - base_model = nautilus_search_directory_get_base_model (NAUTILUS_SEARCH_DIRECTORY (files_view->details->model)); - } else { - base_model = files_view->details->model; - } + if (nautilus_view_is_searching (view)) + { + base_model = nautilus_search_directory_get_base_model (NAUTILUS_SEARCH_DIRECTORY (files_view->details->model)); + } + else + { + base_model = files_view->details->model; + } - set_search_query_internal (NAUTILUS_FILES_VIEW (view), query, base_model); + set_search_query_internal (NAUTILUS_FILES_VIEW (view), query, base_model); } -static GFile* +static GFile * nautilus_files_view_get_location (NautilusView *view) { - NautilusFilesView *files_view; + NautilusFilesView *files_view; - files_view = NAUTILUS_FILES_VIEW (view); + files_view = NAUTILUS_FILES_VIEW (view); - return files_view->details->location; + return files_view->details->location; } static gboolean nautilus_files_view_is_loading (NautilusView *view) { - NautilusFilesView *files_view; + NautilusFilesView *files_view; - files_view = NAUTILUS_FILES_VIEW (view); + files_view = NAUTILUS_FILES_VIEW (view); - return files_view->details->loading; + return files_view->details->loading; } static void nautilus_files_view_iface_init (NautilusViewInterface *iface) { - iface->get_icon = nautilus_files_view_get_icon; - iface->get_location = nautilus_files_view_get_location; - iface->set_location = nautilus_files_view_set_location; - iface->get_selection = nautilus_files_view_get_selection; - iface->set_selection = nautilus_files_view_set_selection; - iface->get_search_query = nautilus_files_view_get_search_query; - iface->set_search_query = nautilus_files_view_set_search_query; - iface->get_toolbar_menu_sections = nautilus_files_view_get_toolbar_menu_sections; - iface->is_searching = nautilus_files_view_is_searching; - iface->is_loading = nautilus_files_view_is_loading; + iface->get_icon = nautilus_files_view_get_icon; + iface->get_location = nautilus_files_view_get_location; + iface->set_location = nautilus_files_view_set_location; + iface->get_selection = nautilus_files_view_get_selection; + iface->set_selection = nautilus_files_view_set_selection; + iface->get_search_query = nautilus_files_view_get_search_query; + iface->set_search_query = nautilus_files_view_set_search_query; + iface->get_toolbar_menu_sections = nautilus_files_view_get_toolbar_menu_sections; + iface->is_searching = nautilus_files_view_is_searching; + iface->is_loading = nautilus_files_view_is_loading; } static void nautilus_files_view_class_init (NautilusFilesViewClass *klass) { - GObjectClass *oclass; - GtkWidgetClass *widget_class; - - widget_class = GTK_WIDGET_CLASS (klass); - oclass = G_OBJECT_CLASS (klass); - - oclass->finalize = nautilus_files_view_finalize; - oclass->get_property = nautilus_files_view_get_property; - oclass->set_property = nautilus_files_view_set_property; - - widget_class->destroy = nautilus_files_view_destroy; - widget_class->key_press_event = nautilus_files_view_key_press_event; - widget_class->scroll_event = nautilus_files_view_scroll_event; - widget_class->parent_set = nautilus_files_view_parent_set; - widget_class->grab_focus = nautilus_files_view_grab_focus; - - g_type_class_add_private (klass, sizeof (NautilusFilesViewDetails)); - - signals[ADD_FILE] = - g_signal_new ("add-file", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NautilusFilesViewClass, add_file), - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY); - signals[BEGIN_FILE_CHANGES] = - g_signal_new ("begin-file-changes", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NautilusFilesViewClass, begin_file_changes), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - signals[BEGIN_LOADING] = - g_signal_new ("begin-loading", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NautilusFilesViewClass, begin_loading), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - signals[CLEAR] = - g_signal_new ("clear", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NautilusFilesViewClass, clear), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - signals[END_FILE_CHANGES] = - g_signal_new ("end-file-changes", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NautilusFilesViewClass, end_file_changes), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - signals[END_LOADING] = - g_signal_new ("end-loading", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NautilusFilesViewClass, end_loading), - NULL, NULL, - g_cclosure_marshal_VOID__BOOLEAN, - G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - signals[FILE_CHANGED] = - g_signal_new ("file-changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NautilusFilesViewClass, file_changed), - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY); - signals[REMOVE_FILE] = - g_signal_new ("remove-file", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NautilusFilesViewClass, remove_file), - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY); - signals[SELECTION_CHANGED] = - g_signal_new ("selection-changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - - klass->get_backing_uri = real_get_backing_uri; - klass->using_manual_layout = real_using_manual_layout; - klass->get_window = nautilus_files_view_get_window; - klass->update_context_menus = real_update_context_menus; - klass->update_actions_state = real_update_actions_state; - klass->check_empty_states = real_check_empty_states; - - copied_files_atom = gdk_atom_intern ("x-special/gnome-copied-files", FALSE); - - g_object_class_install_property ( - oclass, - PROP_WINDOW_SLOT, - g_param_spec_object ("window-slot", - "Window Slot", - "The parent window slot reference", - NAUTILUS_TYPE_WINDOW_SLOT, - G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT_ONLY)); - g_object_class_install_property ( - oclass, - PROP_SUPPORTS_ZOOMING, - g_param_spec_boolean ("supports-zooming", - "Supports zooming", - "Whether the view supports zooming", - TRUE, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_STRINGS)); - - g_object_class_override_property (oclass, PROP_ICON, "icon"); - g_object_class_override_property (oclass, PROP_IS_LOADING, "is-loading"); - g_object_class_override_property (oclass, PROP_IS_SEARCH, "is-searching"); - g_object_class_override_property (oclass, PROP_LOCATION, "location"); - g_object_class_override_property (oclass, PROP_SEARCH_QUERY, "search-query"); + GObjectClass *oclass; + GtkWidgetClass *widget_class; + + widget_class = GTK_WIDGET_CLASS (klass); + oclass = G_OBJECT_CLASS (klass); + + oclass->finalize = nautilus_files_view_finalize; + oclass->get_property = nautilus_files_view_get_property; + oclass->set_property = nautilus_files_view_set_property; + + widget_class->destroy = nautilus_files_view_destroy; + widget_class->key_press_event = nautilus_files_view_key_press_event; + widget_class->scroll_event = nautilus_files_view_scroll_event; + widget_class->parent_set = nautilus_files_view_parent_set; + widget_class->grab_focus = nautilus_files_view_grab_focus; + + g_type_class_add_private (klass, sizeof (NautilusFilesViewDetails)); + + signals[ADD_FILE] = + g_signal_new ("add-file", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusFilesViewClass, add_file), + NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY); + signals[BEGIN_FILE_CHANGES] = + g_signal_new ("begin-file-changes", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusFilesViewClass, begin_file_changes), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + signals[BEGIN_LOADING] = + g_signal_new ("begin-loading", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusFilesViewClass, begin_loading), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + signals[CLEAR] = + g_signal_new ("clear", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusFilesViewClass, clear), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + signals[END_FILE_CHANGES] = + g_signal_new ("end-file-changes", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusFilesViewClass, end_file_changes), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + signals[END_LOADING] = + g_signal_new ("end-loading", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusFilesViewClass, end_loading), + NULL, NULL, + g_cclosure_marshal_VOID__BOOLEAN, + G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + signals[FILE_CHANGED] = + g_signal_new ("file-changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusFilesViewClass, file_changed), + NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY); + signals[REMOVE_FILE] = + g_signal_new ("remove-file", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusFilesViewClass, remove_file), + NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, 2, NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_DIRECTORY); + signals[SELECTION_CHANGED] = + g_signal_new ("selection-changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + klass->get_backing_uri = real_get_backing_uri; + klass->using_manual_layout = real_using_manual_layout; + klass->get_window = nautilus_files_view_get_window; + klass->update_context_menus = real_update_context_menus; + klass->update_actions_state = real_update_actions_state; + klass->check_empty_states = real_check_empty_states; + + copied_files_atom = gdk_atom_intern ("x-special/gnome-copied-files", FALSE); + + g_object_class_install_property ( + oclass, + PROP_WINDOW_SLOT, + g_param_spec_object ("window-slot", + "Window Slot", + "The parent window slot reference", + NAUTILUS_TYPE_WINDOW_SLOT, + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property ( + oclass, + PROP_SUPPORTS_ZOOMING, + g_param_spec_boolean ("supports-zooming", + "Supports zooming", + "Whether the view supports zooming", + TRUE, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); + + g_object_class_override_property (oclass, PROP_ICON, "icon"); + g_object_class_override_property (oclass, PROP_IS_LOADING, "is-loading"); + g_object_class_override_property (oclass, PROP_IS_SEARCH, "is-searching"); + g_object_class_override_property (oclass, PROP_LOCATION, "location"); + g_object_class_override_property (oclass, PROP_SEARCH_QUERY, "search-query"); } static void nautilus_files_view_init (NautilusFilesView *view) { - GtkBuilder *builder; - AtkObject *atk_object; - NautilusDirectory *scripts_directory; - NautilusDirectory *templates_directory; - gchar *templates_uri; - GApplication *app; - const gchar *open_accels[] = { - "<control>o", - "<alt>Down", - NULL - }; - const gchar *open_properties[] = { - "<control>i", - "<alt>Return", - NULL - }; - const gchar *zoom_in_accels[] = { - "<control>equal", - "<control>plus", - NULL - }; - - nautilus_profile_start (NULL); - - view->details = G_TYPE_INSTANCE_GET_PRIVATE (view, NAUTILUS_TYPE_FILES_VIEW, - NautilusFilesViewDetails); - - /* Toolbar menu */ - builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-toolbar-view-menu.ui"); - view->details->toolbar_menu_sections = g_new0 (NautilusToolbarMenuSections, 1); - view->details->toolbar_menu_sections->supports_undo_redo = TRUE; - view->details->toolbar_menu_sections->zoom_section = g_object_ref_sink (gtk_builder_get_object (builder, "zoom_section")); - view->details->toolbar_menu_sections->extended_section = g_object_ref_sink (gtk_builder_get_object (builder, "extended_section")); - view->details->zoom_controls_box = GTK_WIDGET (gtk_builder_get_object (builder, "zoom_controls_box")); - view->details->zoom_level_label = GTK_WIDGET (gtk_builder_get_object (builder, "zoom_level_label")); - - view->details->sort_menu = GTK_WIDGET (gtk_builder_get_object (builder, "sort_menu")); - view->details->sort_trash_time = GTK_WIDGET (gtk_builder_get_object (builder, "sort_trash_time")); - view->details->visible_columns = GTK_WIDGET (gtk_builder_get_object (builder, "visible_columns")); - view->details->reload = GTK_WIDGET (gtk_builder_get_object (builder, "reload")); - view->details->stop = GTK_WIDGET (gtk_builder_get_object (builder, "stop")); - - g_signal_connect (view, - "end-file-changes", - G_CALLBACK (on_end_file_changes), - view); - - g_object_unref (builder); - - /* Main widgets */ - gtk_orientable_set_orientation (GTK_ORIENTABLE (view), GTK_ORIENTATION_VERTICAL); - view->details->overlay = gtk_overlay_new (); - gtk_widget_set_vexpand (view->details->overlay, TRUE); - gtk_widget_set_hexpand (view->details->overlay, TRUE); - gtk_container_add (GTK_CONTAINER (view), view->details->overlay); - gtk_widget_show (view->details->overlay); - - /* NautilusFloatingBar listen to its parent's 'enter-notify-event' signal - * and GtkOverlay doesn't have it enabled by default, so we have to add them - * here. - */ - gtk_widget_add_events (GTK_WIDGET (view->details->overlay), - GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK); - - /* Scrolled Window */ - view->details->scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view->details->scrolled_window), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_widget_show (view->details->scrolled_window); - - g_signal_connect_swapped (view->details->scrolled_window, - "scroll-event", - G_CALLBACK (nautilus_files_view_scroll_event), - view); - - gtk_container_add (GTK_CONTAINER (view->details->overlay), view->details->scrolled_window); - - /* Empty states */ - builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-no-search-results.ui"); - view->details->no_search_results_widget = GTK_WIDGET (gtk_builder_get_object (builder, "no_search_results")); - gtk_overlay_add_overlay (GTK_OVERLAY (view->details->overlay), view->details->no_search_results_widget); - gtk_overlay_set_overlay_pass_through (GTK_OVERLAY (view->details->overlay), - view->details->no_search_results_widget, - TRUE); - g_object_unref (builder); - - builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-folder-is-empty.ui"); - view->details->folder_is_empty_widget = GTK_WIDGET (gtk_builder_get_object (builder, "folder_is_empty")); - gtk_overlay_add_overlay (GTK_OVERLAY (view->details->overlay), view->details->folder_is_empty_widget); - gtk_overlay_set_overlay_pass_through (GTK_OVERLAY (view->details->overlay), - view->details->folder_is_empty_widget, - TRUE); - g_object_unref (builder); - - /* Floating bar */ - view->details->floating_bar = nautilus_floating_bar_new (NULL, NULL, FALSE); - gtk_widget_set_halign (view->details->floating_bar, GTK_ALIGN_END); - gtk_widget_set_valign (view->details->floating_bar, GTK_ALIGN_END); - gtk_overlay_add_overlay (GTK_OVERLAY (view->details->overlay), view->details->floating_bar); - - g_signal_connect (view->details->floating_bar, - "action", - G_CALLBACK (floating_bar_action_cb), - view); - - /* Default to true; desktop-icon-view sets to false */ - view->details->show_foreign_files = TRUE; - - view->details->non_ready_files = - g_hash_table_new_full (file_and_directory_hash, - file_and_directory_equal, - (GDestroyNotify)file_and_directory_free, - NULL); - - view->details->pending_reveal = g_hash_table_new (NULL, NULL); - - gtk_style_context_set_junction_sides (gtk_widget_get_style_context (GTK_WIDGET (view)), - GTK_JUNCTION_TOP | GTK_JUNCTION_LEFT); - - if (set_up_scripts_directory_global ()) { - scripts_directory = nautilus_directory_get_by_uri (scripts_directory_uri); - add_directory_to_scripts_directory_list (view, scripts_directory); - nautilus_directory_unref (scripts_directory); - } else { - g_warning ("Ignoring scripts directory, it may be a broken link\n"); - } - - if (nautilus_should_use_templates_directory ()) { - templates_uri = nautilus_get_templates_directory_uri (); - templates_directory = nautilus_directory_get_by_uri (templates_uri); - g_free (templates_uri); - add_directory_to_templates_directory_list (view, templates_directory); - nautilus_directory_unref (templates_directory); - } - update_templates_directory (view); - - view->details->sort_directories_first = - g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); - view->details->show_hidden_files = - g_settings_get_boolean (gtk_filechooser_preferences, NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); - - g_signal_connect_object (nautilus_trash_monitor_get (), "trash-state-changed", - G_CALLBACK (nautilus_files_view_trash_state_changed_callback), view, 0); - - /* React to clipboard changes */ - g_signal_connect_object (nautilus_clipboard_monitor_get (), "clipboard-changed", - G_CALLBACK (clipboard_changed_callback), view, 0); - - /* Register to menu provider extension signal managing menu updates */ - g_signal_connect_object (nautilus_signaller_get_current (), "popup-menu-changed", - G_CALLBACK (schedule_update_context_menus), view, G_CONNECT_SWAPPED); - - gtk_widget_show (GTK_WIDGET (view)); - - g_signal_connect_swapped (nautilus_preferences, - "changed::" NAUTILUS_PREFERENCES_CLICK_POLICY, - G_CALLBACK (click_policy_changed_callback), - view); - g_signal_connect_swapped (nautilus_preferences, - "changed::" NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, - G_CALLBACK (sort_directories_first_changed_callback), view); - g_signal_connect_swapped (gtk_filechooser_preferences, - "changed::" NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, - G_CALLBACK (show_hidden_files_changed_callback), view); - g_signal_connect_swapped (gnome_lockdown_preferences, - "changed::" NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE, - G_CALLBACK (schedule_update_context_menus), view); - - view->details->in_destruction = FALSE; - - /* Accessibility */ - atk_object = gtk_widget_get_accessible (GTK_WIDGET (view)); - atk_object_set_name (atk_object, _("Content View")); - atk_object_set_description (atk_object, _("View of the current folder")); - - view->details->view_action_group = G_ACTION_GROUP (g_simple_action_group_new ()); - g_action_map_add_action_entries (G_ACTION_MAP (view->details->view_action_group), - view_entries, - G_N_ELEMENTS (view_entries), - view); - gtk_widget_insert_action_group (GTK_WIDGET (view), - "view", - G_ACTION_GROUP (view->details->view_action_group)); - app = g_application_get_default (); - - /* Toolbar menu */ - nautilus_application_set_accelerators (app, "view.zoom-in", zoom_in_accels); - nautilus_application_set_accelerator (app, "view.zoom-out", "<control>minus"); - nautilus_application_set_accelerator (app, "view.show-hidden-files", "<control>h"); - /* Background menu */ - nautilus_application_set_accelerator (app, "view.select-all", "<control>a"); - nautilus_application_set_accelerator (app, "view.paste", "<control>v"); - nautilus_application_set_accelerator (app, "view.create-link", "<control>m"); - /* Selection menu */ - nautilus_application_set_accelerators (app, "view.open-with-default-application", open_accels); - nautilus_application_set_accelerator (app, "view.open-item-new-tab", "<shift><control>t"); - nautilus_application_set_accelerator (app, "view.open-item-new-window", "<shift><control>w"); - nautilus_application_set_accelerator (app, "view.move-to-trash", "Delete"); - nautilus_application_set_accelerator (app, "view.delete-from-trash", "Delete"); - nautilus_application_set_accelerator (app, "view.delete-permanently-shortcut", "<shift>Delete"); - /* When trash is not available, allow the "Delete" key to delete permanently, that is, when - * the menu item is available, since we never make both the trash and delete-permanently-menu-item - * actions active */ - nautilus_application_set_accelerator (app, "view.delete-permanently-menu-item", "Delete"); - nautilus_application_set_accelerator (app, "view.permanent-delete-permanently-menu-item", "<shift>Delete"); - nautilus_application_set_accelerators (app, "view.properties", open_properties); - nautilus_application_set_accelerator (app, "view.open-item-location", "<control><alt>o"); - nautilus_application_set_accelerator (app, "view.rename", "F2"); - nautilus_application_set_accelerator (app, "view.cut", "<control>x"); - nautilus_application_set_accelerator (app, "view.copy", "<control>c"); - nautilus_application_set_accelerator (app, "view.create-link-in-place", "<control><shift>m"); - nautilus_application_set_accelerator (app, "view.new-folder", "<control><shift>n"); - /* Only accesible by shorcuts */ - nautilus_application_set_accelerator (app, "view.select-pattern", "<control>s"); - nautilus_application_set_accelerator (app, "view.zoom-standard", "<control>0"); - nautilus_application_set_accelerator (app, "view.invert-selection", "<shift><control>i"); - nautilus_application_set_accelerator (app, "view.open-file-and-close-window", "<control><shift>Down"); - - /* Show a warning dialog to inform the user that the shorcut for move to trash - * changed */ - nautilus_application_set_accelerator (app, "view.show-move-to-trash-shortcut-changed-dialog", "<control>Delete"); - - nautilus_profile_end (NULL); + GtkBuilder *builder; + AtkObject *atk_object; + NautilusDirectory *scripts_directory; + NautilusDirectory *templates_directory; + gchar *templates_uri; + GApplication *app; + const gchar *open_accels[] = + { + "<control>o", + "<alt>Down", + NULL + }; + const gchar *open_properties[] = + { + "<control>i", + "<alt>Return", + NULL + }; + const gchar *zoom_in_accels[] = + { + "<control>equal", + "<control>plus", + NULL + }; + + nautilus_profile_start (NULL); + + view->details = G_TYPE_INSTANCE_GET_PRIVATE (view, NAUTILUS_TYPE_FILES_VIEW, + NautilusFilesViewDetails); + + /* Toolbar menu */ + builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-toolbar-view-menu.ui"); + view->details->toolbar_menu_sections = g_new0 (NautilusToolbarMenuSections, 1); + view->details->toolbar_menu_sections->supports_undo_redo = TRUE; + view->details->toolbar_menu_sections->zoom_section = g_object_ref_sink (gtk_builder_get_object (builder, "zoom_section")); + view->details->toolbar_menu_sections->extended_section = g_object_ref_sink (gtk_builder_get_object (builder, "extended_section")); + view->details->zoom_controls_box = GTK_WIDGET (gtk_builder_get_object (builder, "zoom_controls_box")); + view->details->zoom_level_label = GTK_WIDGET (gtk_builder_get_object (builder, "zoom_level_label")); + + view->details->sort_menu = GTK_WIDGET (gtk_builder_get_object (builder, "sort_menu")); + view->details->sort_trash_time = GTK_WIDGET (gtk_builder_get_object (builder, "sort_trash_time")); + view->details->visible_columns = GTK_WIDGET (gtk_builder_get_object (builder, "visible_columns")); + view->details->reload = GTK_WIDGET (gtk_builder_get_object (builder, "reload")); + view->details->stop = GTK_WIDGET (gtk_builder_get_object (builder, "stop")); + + g_signal_connect (view, + "end-file-changes", + G_CALLBACK (on_end_file_changes), + view); + + g_object_unref (builder); + + /* Main widgets */ + gtk_orientable_set_orientation (GTK_ORIENTABLE (view), GTK_ORIENTATION_VERTICAL); + view->details->overlay = gtk_overlay_new (); + gtk_widget_set_vexpand (view->details->overlay, TRUE); + gtk_widget_set_hexpand (view->details->overlay, TRUE); + gtk_container_add (GTK_CONTAINER (view), view->details->overlay); + gtk_widget_show (view->details->overlay); + + /* NautilusFloatingBar listen to its parent's 'enter-notify-event' signal + * and GtkOverlay doesn't have it enabled by default, so we have to add them + * here. + */ + gtk_widget_add_events (GTK_WIDGET (view->details->overlay), + GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK); + + /* Scrolled Window */ + view->details->scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view->details->scrolled_window), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_widget_show (view->details->scrolled_window); + + g_signal_connect_swapped (view->details->scrolled_window, + "scroll-event", + G_CALLBACK (nautilus_files_view_scroll_event), + view); + + gtk_container_add (GTK_CONTAINER (view->details->overlay), view->details->scrolled_window); + + /* Empty states */ + builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-no-search-results.ui"); + view->details->no_search_results_widget = GTK_WIDGET (gtk_builder_get_object (builder, "no_search_results")); + gtk_overlay_add_overlay (GTK_OVERLAY (view->details->overlay), view->details->no_search_results_widget); + gtk_overlay_set_overlay_pass_through (GTK_OVERLAY (view->details->overlay), + view->details->no_search_results_widget, + TRUE); + g_object_unref (builder); + + builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-folder-is-empty.ui"); + view->details->folder_is_empty_widget = GTK_WIDGET (gtk_builder_get_object (builder, "folder_is_empty")); + gtk_overlay_add_overlay (GTK_OVERLAY (view->details->overlay), view->details->folder_is_empty_widget); + gtk_overlay_set_overlay_pass_through (GTK_OVERLAY (view->details->overlay), + view->details->folder_is_empty_widget, + TRUE); + g_object_unref (builder); + + /* Floating bar */ + view->details->floating_bar = nautilus_floating_bar_new (NULL, NULL, FALSE); + gtk_widget_set_halign (view->details->floating_bar, GTK_ALIGN_END); + gtk_widget_set_valign (view->details->floating_bar, GTK_ALIGN_END); + gtk_overlay_add_overlay (GTK_OVERLAY (view->details->overlay), view->details->floating_bar); + + g_signal_connect (view->details->floating_bar, + "action", + G_CALLBACK (floating_bar_action_cb), + view); + + /* Default to true; desktop-icon-view sets to false */ + view->details->show_foreign_files = TRUE; + + view->details->non_ready_files = + g_hash_table_new_full (file_and_directory_hash, + file_and_directory_equal, + (GDestroyNotify) file_and_directory_free, + NULL); + + view->details->pending_reveal = g_hash_table_new (NULL, NULL); + + gtk_style_context_set_junction_sides (gtk_widget_get_style_context (GTK_WIDGET (view)), + GTK_JUNCTION_TOP | GTK_JUNCTION_LEFT); + + if (set_up_scripts_directory_global ()) + { + scripts_directory = nautilus_directory_get_by_uri (scripts_directory_uri); + add_directory_to_scripts_directory_list (view, scripts_directory); + nautilus_directory_unref (scripts_directory); + } + else + { + g_warning ("Ignoring scripts directory, it may be a broken link\n"); + } + + if (nautilus_should_use_templates_directory ()) + { + templates_uri = nautilus_get_templates_directory_uri (); + templates_directory = nautilus_directory_get_by_uri (templates_uri); + g_free (templates_uri); + add_directory_to_templates_directory_list (view, templates_directory); + nautilus_directory_unref (templates_directory); + } + update_templates_directory (view); + + view->details->sort_directories_first = + g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); + view->details->show_hidden_files = + g_settings_get_boolean (gtk_filechooser_preferences, NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); + + g_signal_connect_object (nautilus_trash_monitor_get (), "trash-state-changed", + G_CALLBACK (nautilus_files_view_trash_state_changed_callback), view, 0); + + /* React to clipboard changes */ + g_signal_connect_object (nautilus_clipboard_monitor_get (), "clipboard-changed", + G_CALLBACK (clipboard_changed_callback), view, 0); + + /* Register to menu provider extension signal managing menu updates */ + g_signal_connect_object (nautilus_signaller_get_current (), "popup-menu-changed", + G_CALLBACK (schedule_update_context_menus), view, G_CONNECT_SWAPPED); + + gtk_widget_show (GTK_WIDGET (view)); + + g_signal_connect_swapped (nautilus_preferences, + "changed::" NAUTILUS_PREFERENCES_CLICK_POLICY, + G_CALLBACK (click_policy_changed_callback), + view); + g_signal_connect_swapped (nautilus_preferences, + "changed::" NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, + G_CALLBACK (sort_directories_first_changed_callback), view); + g_signal_connect_swapped (gtk_filechooser_preferences, + "changed::" NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, + G_CALLBACK (show_hidden_files_changed_callback), view); + g_signal_connect_swapped (gnome_lockdown_preferences, + "changed::" NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE, + G_CALLBACK (schedule_update_context_menus), view); + + view->details->in_destruction = FALSE; + + /* Accessibility */ + atk_object = gtk_widget_get_accessible (GTK_WIDGET (view)); + atk_object_set_name (atk_object, _("Content View")); + atk_object_set_description (atk_object, _("View of the current folder")); + + view->details->view_action_group = G_ACTION_GROUP (g_simple_action_group_new ()); + g_action_map_add_action_entries (G_ACTION_MAP (view->details->view_action_group), + view_entries, + G_N_ELEMENTS (view_entries), + view); + gtk_widget_insert_action_group (GTK_WIDGET (view), + "view", + G_ACTION_GROUP (view->details->view_action_group)); + app = g_application_get_default (); + + /* Toolbar menu */ + nautilus_application_set_accelerators (app, "view.zoom-in", zoom_in_accels); + nautilus_application_set_accelerator (app, "view.zoom-out", "<control>minus"); + nautilus_application_set_accelerator (app, "view.show-hidden-files", "<control>h"); + /* Background menu */ + nautilus_application_set_accelerator (app, "view.select-all", "<control>a"); + nautilus_application_set_accelerator (app, "view.paste", "<control>v"); + nautilus_application_set_accelerator (app, "view.create-link", "<control>m"); + /* Selection menu */ + nautilus_application_set_accelerators (app, "view.open-with-default-application", open_accels); + nautilus_application_set_accelerator (app, "view.open-item-new-tab", "<shift><control>t"); + nautilus_application_set_accelerator (app, "view.open-item-new-window", "<shift><control>w"); + nautilus_application_set_accelerator (app, "view.move-to-trash", "Delete"); + nautilus_application_set_accelerator (app, "view.delete-from-trash", "Delete"); + nautilus_application_set_accelerator (app, "view.delete-permanently-shortcut", "<shift>Delete"); + /* When trash is not available, allow the "Delete" key to delete permanently, that is, when + * the menu item is available, since we never make both the trash and delete-permanently-menu-item + * actions active */ + nautilus_application_set_accelerator (app, "view.delete-permanently-menu-item", "Delete"); + nautilus_application_set_accelerator (app, "view.permanent-delete-permanently-menu-item", "<shift>Delete"); + nautilus_application_set_accelerators (app, "view.properties", open_properties); + nautilus_application_set_accelerator (app, "view.open-item-location", "<control><alt>o"); + nautilus_application_set_accelerator (app, "view.rename", "F2"); + nautilus_application_set_accelerator (app, "view.cut", "<control>x"); + nautilus_application_set_accelerator (app, "view.copy", "<control>c"); + nautilus_application_set_accelerator (app, "view.create-link-in-place", "<control><shift>m"); + nautilus_application_set_accelerator (app, "view.new-folder", "<control><shift>n"); + /* Only accesible by shorcuts */ + nautilus_application_set_accelerator (app, "view.select-pattern", "<control>s"); + nautilus_application_set_accelerator (app, "view.zoom-standard", "<control>0"); + nautilus_application_set_accelerator (app, "view.invert-selection", "<shift><control>i"); + nautilus_application_set_accelerator (app, "view.open-file-and-close-window", "<control><shift>Down"); + + /* Show a warning dialog to inform the user that the shorcut for move to trash + * changed */ + nautilus_application_set_accelerator (app, "view.show-move-to-trash-shortcut-changed-dialog", "<control>Delete"); + + nautilus_profile_end (NULL); } NautilusFilesView * -nautilus_files_view_new (guint id, +nautilus_files_view_new (guint id, NautilusWindowSlot *slot) { - NautilusFilesView *view = NULL; + NautilusFilesView *view = NULL; - switch (id) { + switch (id) + { case NAUTILUS_VIEW_GRID_ID: + { view = nautilus_canvas_view_new (slot); - break; + } + break; + case NAUTILUS_VIEW_LIST_ID: + { view = nautilus_list_view_new (slot); - break; + } + break; + #if ENABLE_EMPTY_VIEW case NAUTILUS_VIEW_EMPTY_ID: + { view = nautilus_empty_view_new (slot); - break; + } + break; #endif - } - - if (view == NULL) { - g_critical ("Unknown view type ID: %d", id); - } else if (g_object_is_floating (view)) { - g_object_ref_sink (view); - } - - return view; + } + + if (view == NULL) + { + g_critical ("Unknown view type ID: %d", id); + } + else if (g_object_is_floating (view)) + { + g_object_ref_sink (view); + } + + return view; } |