diff options
-rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 18 | ||||
-rw-r--r-- | libnautilus-private/nautilus-file-undo-manager.c | 10 | ||||
-rw-r--r-- | libnautilus-private/nautilus-file-undo-manager.h | 2 | ||||
-rw-r--r-- | libnautilus-private/nautilus-file.c | 8 |
4 files changed, 19 insertions, 19 deletions
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 2b5fc58de..9a93d8a70 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -2231,7 +2231,7 @@ trash_or_delete_internal (GList *files, inhibit_power_manager ((CommonJob *)job, _("Deleting Files")); } - if (!nautilus_file_undo_manager_get_flag () && try_trash) { + if (!nautilus_file_undo_manager_is_operating () && try_trash) { job->common.undo_info = nautilus_file_undo_info_trash_new (g_list_length (files)); } @@ -5126,7 +5126,7 @@ nautilus_file_operations_copy (GList *files, inhibit_power_manager ((CommonJob *)job, _("Copying Files")); - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { GFile* src_dir; src_dir = g_file_get_parent (files->data); @@ -5667,7 +5667,7 @@ nautilus_file_operations_move (GList *files, inhibit_power_manager ((CommonJob *)job, _("Moving Files")); - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { GFile* src_dir; src_dir = g_file_get_parent (files->data); @@ -5994,7 +5994,7 @@ nautilus_file_operations_link (GList *files, } job->debuting_files = g_hash_table_new_full (g_file_hash, (GEqualFunc)g_file_equal, g_object_unref, NULL); - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { GFile* src_dir; src_dir = g_file_get_parent (files->data); @@ -6042,7 +6042,7 @@ nautilus_file_operations_duplicate (GList *files, } job->debuting_files = g_hash_table_new_full (g_file_hash, (GEqualFunc)g_file_equal, g_object_unref, NULL); - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { GFile* src_dir; src_dir = g_file_get_parent (files->data); @@ -6214,7 +6214,7 @@ nautilus_file_set_permissions_recursive (const char *directory, job->done_callback = callback; job->done_callback_data = callback_data; - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { job->common.undo_info = nautilus_file_undo_info_rec_permissions_new (job->file, file_permissions, file_mask, @@ -6739,7 +6739,7 @@ nautilus_file_operations_new_folder (GtkWidget *parent_view, job->has_position = TRUE; } - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { job->common.undo_info = nautilus_file_undo_info_create_new (NAUTILUS_FILE_UNDO_OP_CREATE_FOLDER); } @@ -6781,7 +6781,7 @@ nautilus_file_operations_new_file_from_template (GtkWidget *parent_view, job->src = g_file_new_for_uri (template_uri); } - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { job->common.undo_info = nautilus_file_undo_info_create_new (NAUTILUS_FILE_UNDO_OP_CREATE_FILE_FROM_TEMPLATE); } @@ -6822,7 +6822,7 @@ nautilus_file_operations_new_file (GtkWidget *parent_view, job->length = length; job->filename = g_strdup (target_filename); - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { job->common.undo_info = nautilus_file_undo_info_create_new (NAUTILUS_FILE_UNDO_OP_CREATE_EMPTY_FILE); } diff --git a/libnautilus-private/nautilus-file-undo-manager.c b/libnautilus-private/nautilus-file-undo-manager.c index 7de970148..862060f03 100644 --- a/libnautilus-private/nautilus-file-undo-manager.c +++ b/libnautilus-private/nautilus-file-undo-manager.c @@ -51,7 +51,7 @@ struct _NautilusFileUndoManagerPrivate NautilusFileUndoManagerState state; NautilusFileUndoManagerState last_state; - guint undo_redo_flag : 1; + guint is_operating : 1; gulong trash_signal_id; }; @@ -158,7 +158,7 @@ undo_info_apply_ready (GObject *source, success = nautilus_file_undo_info_apply_finish (info, res, &user_cancel, NULL); - self->priv->undo_redo_flag = FALSE; + self->priv->is_operating = FALSE; /* just return in case we got another another operation set */ if ((self->priv->info != NULL) && @@ -192,7 +192,7 @@ do_undo_redo (NautilusFileUndoManager *self, self->priv->last_state = self->priv->state; - self->priv->undo_redo_flag = TRUE; + self->priv->is_operating = TRUE; nautilus_file_undo_info_apply_async (self->priv->info, undo, parent_window, undo_info_apply_ready, self); @@ -265,10 +265,10 @@ nautilus_file_undo_manager_get_state (void) gboolean -nautilus_file_undo_manager_get_flag () +nautilus_file_undo_manager_is_operating () { NautilusFileUndoManager *self = get_singleton (); - return self->priv->undo_redo_flag; + return self->priv->is_operating; } NautilusFileUndoManager * diff --git a/libnautilus-private/nautilus-file-undo-manager.h b/libnautilus-private/nautilus-file-undo-manager.h index 8163a32b2..760bc3d53 100644 --- a/libnautilus-private/nautilus-file-undo-manager.h +++ b/libnautilus-private/nautilus-file-undo-manager.h @@ -79,6 +79,6 @@ NautilusFileUndoManagerState nautilus_file_undo_manager_get_state (void); void nautilus_file_undo_manager_undo (GtkWindow *parent_window); void nautilus_file_undo_manager_redo (GtkWindow *parent_window); -gboolean nautilus_file_undo_manager_get_flag (void); +gboolean nautilus_file_undo_manager_is_operating (void); #endif /* __NAUTILUS_FILE_UNDO_MANAGER_H__ */ diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 9f809b27e..f52ac5bc5 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -1970,7 +1970,7 @@ nautilus_file_rename (NautilusFile *file, location = nautilus_file_get_location (file); /* Tell the undo manager a rename is taking place */ - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { op->undo_info = nautilus_file_undo_info_rename_new (); old_name = nautilus_file_get_display_name (file); @@ -5249,7 +5249,7 @@ nautilus_file_set_permissions (NautilusFile *file, return; } - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { NautilusFileUndoInfo *undo_info; undo_info = nautilus_file_undo_info_permissions_new (nautilus_file_get_location (file), @@ -5562,7 +5562,7 @@ nautilus_file_set_owner (NautilusFile *file, return; } - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { NautilusFileUndoInfo *undo_info; char* current_owner; @@ -5840,7 +5840,7 @@ nautilus_file_set_group (NautilusFile *file, return; } - if (!nautilus_file_undo_manager_get_flag ()) { + if (!nautilus_file_undo_manager_is_operating ()) { NautilusFileUndoInfo *undo_info; char *current_group; |