diff options
| author | Gene Z. Ragan <gzr@eazel.com> | 2000-05-19 17:06:15 +0000 |
|---|---|---|
| committer | Gene Ragan <gzr@src.gnome.org> | 2000-05-19 17:06:15 +0000 |
| commit | 71a5435f1b88122181c329937f90e786c51afee5 (patch) | |
| tree | 8121fda78ccc9b02e54f233f8b350eaa0645e7cb /libnautilus-extensions/nautilus-entry.c | |
| parent | 7fcaf4c2c48f8c265bdf444ff9dcb1024e577755 (diff) | |
| download | nautilus-71a5435f1b88122181c329937f90e786c51afee5.tar.gz | |
More undo framework work. Still incomplete.
2000-05-19 Gene Z. Ragan <gzr@eazel.com>
More undo framework work. Still incomplete.
* libnautilus-extensions/nautilus-entry.c:
(nautilus_entry_changed):
Modified to use new undo manager location API
* libnautilus-extensions/nautilus-icon-text-item.c:
(iti_event),
(restore_from_undo_snapshot_callback):
Modified to use new undo manager location API
* libnautilus/nautilus-undo-manager.c:
* libnautilus/nautilus-undo-manager.h:
(impl_Nautilus_Undo_Manager__create),
(impl_Nautilus_Undo_Manager__append),
(impl_Nautilus_Undo_Manager__forget),
(nautilus_undo_manager_begin_transaction),
(nautilus_undo_manager_end_transaction),
(nautilus_undo_manager_undo), (nautilus_undo_manager_redo),
(nautilus_undo_manager_add_transaction),
(nautilus_undo_manager_unregister_object),
(free_undo_manager_list_data), (prune_undo_manager_list):
Modified to use new API and Undo::Manager::Transaction
* libnautilus/nautilus-undo-transaction.c:
* libnautilus/nautilus-undo-transaction.h:
(impl_Nautilus_Undo_Transaction__destroy),
(impl_Nautilus_Undo_Transaction__create),
(impl_Nautilus_Undo_Transaction__get_undo_description),
(impl_Nautilus_Undo_Transaction__get_redo_description),
(impl_Nautilus_Undo_Transaction__get_base_description),
(impl_Nautilus_Undo_Transaction__undo),
(nautilus_undo_transaction_new),
(nautilus_undo_transaction_initialize),
(nautilus_undo_transaction_destroy),
(nautilus_undo_transaction_initialize_class),
(nautilus_undo_transaction_undo),
(nautilus_undo_transaction_contains_object):
Added support for new Undo::Manager::Transaction object
Diffstat (limited to 'libnautilus-extensions/nautilus-entry.c')
| -rw-r--r-- | libnautilus-extensions/nautilus-entry.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libnautilus-extensions/nautilus-entry.c b/libnautilus-extensions/nautilus-entry.c index dffb13533..d0707eea3 100644 --- a/libnautilus-extensions/nautilus-entry.c +++ b/libnautilus-extensions/nautilus-entry.c @@ -190,7 +190,8 @@ static void nautilus_entry_changed (GtkEditable *editable) { NautilusEntry *entry; - NautilusUndoTransactionInProgress *tip; + NautilusUndoTransaction *transaction; + NautilusUndoManager *manager; g_assert (GTK_IS_EDITABLE (editable)); g_assert (NAUTILUS_IS_ENTRY (editable)); @@ -199,10 +200,13 @@ nautilus_entry_changed (GtkEditable *editable) /* Register undo transaction */ if (!entry->undo_registered && entry->use_undo) { - tip = nautilus_undo_manager_begin_transaction (GTK_OBJECT (entry), _("Edit")); - nautilus_undoable_save_undo_snapshot (tip->transaction, GTK_OBJECT(entry), save_undo_snapshot_callback, + + manager = nautilus_get_undo_manager (GTK_OBJECT (entry)); + g_assert (manager); + transaction = nautilus_undo_manager_begin_transaction (manager, _("Edit")); + nautilus_undoable_save_undo_snapshot (transaction, GTK_OBJECT(entry), save_undo_snapshot_callback, restore_from_undo_snapshot_callback); - nautilus_undo_manager_end_transaction (tip); + nautilus_undo_manager_end_transaction (manager, transaction); entry->undo_registered = TRUE; } |