summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog23
-rw-r--r--libnautilus-extensions/nautilus-entry.c3
-rw-r--r--libnautilus-extensions/nautilus-undo-manager.c103
-rw-r--r--libnautilus-extensions/nautilus-undo-manager.h2
-rw-r--r--libnautilus-private/nautilus-entry.c3
-rw-r--r--libnautilus-private/nautilus-undo-manager.c103
-rw-r--r--libnautilus-private/nautilus-undo-manager.h2
-rw-r--r--libnautilus/nautilus-undo-manager.c103
-rw-r--r--libnautilus/nautilus-undo-manager.h2
-rw-r--r--libnautilus/nautilus-undoable.c7
-rw-r--r--libnautilus/nautilus-undoable.h1
-rw-r--r--src/nautilus-window-manage-views.c2
-rw-r--r--src/ntl-window-msgs.c2
13 files changed, 152 insertions, 204 deletions
diff --git a/ChangeLog b/ChangeLog
index 5cdced1e2..b5854cc94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2000-05-24 Gene Z. Ragan <gzr@eazel.com>
+
+ * libnautilus/nautilus-undo-manager.c:
+ (impl_Nautilus_Undo_Manager__forget),
+ (nautilus_undo_manager_add_transaction),
+ (nautilus_undo_manager_forget_transaction):
+ Added code to these functions that actually works.
+
+ * libnautilus-extensions/nautilus-entry.c:
+ (nautilus_entry_enable_undo):
+ Work in progress on undo.
+
+ * libnautilus/nautilus-undo-manager.h:
+ * libnautilus/nautilus-undoable.c:
+ * libnautilus/nautilus-undoable.h:
+ (nautilus_undo_unregister):
+ Make this call private to the source file.
+
+ * src/ntl-window-msgs.c:
+ (nautilus_window_request_title_change):
+ Fixed a build breakeing typo made by my hero.
+ I can't believe it!
+
2000-05-24 Darin Adler <darin@eazel.com>
Eliminated ContentView and ContentViewFrame.
diff --git a/libnautilus-extensions/nautilus-entry.c b/libnautilus-extensions/nautilus-entry.c
index e88bf0ee9..ee6dd5886 100644
--- a/libnautilus-extensions/nautilus-entry.c
+++ b/libnautilus-extensions/nautilus-entry.c
@@ -270,7 +270,8 @@ nautilus_entry_enable_undo (NautilusEntry *entry, gboolean value)
update_undo_text (entry);
}
} else {
- nautilus_undo_unregister (GTK_OBJECT (entry));
+ /* FIXME */
+ /* nautilus_undo_unregister (GTK_OBJECT (entry)); */
}
}
diff --git a/libnautilus-extensions/nautilus-undo-manager.c b/libnautilus-extensions/nautilus-undo-manager.c
index 46271096a..0a1ced957 100644
--- a/libnautilus-extensions/nautilus-undo-manager.c
+++ b/libnautilus-extensions/nautilus-undo-manager.c
@@ -54,24 +54,26 @@ typedef struct {
} impl_POA_Nautilus_Undo_Manager;
/* GtkObject */
-static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class);
-static void nautilus_undo_manager_initialize (NautilusUndoManager *item);
-static void destroy (GtkObject *object);
-static void free_undo_manager_list (GList *list);
-static GList *prune_undo_manager_list (GList *list,
- int items);
+static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class);
+static void nautilus_undo_manager_initialize (NautilusUndoManager *item);
+static void destroy (GtkObject *object);
+static void free_undo_manager_list (GList *list);
+static GList *prune_undo_manager_list (GList *list,
+ int items);
/* CORBA/Bonobo */
-static void impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant,
- const Nautilus_Undo_Transaction transaction,
- CORBA_Environment *ev);
-static void impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant,
- const Nautilus_Undo_Transaction transaction,
- CORBA_Environment *ev);
-static void impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant,
- CORBA_Environment *ev);
-static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
- Nautilus_Undo_Transaction transaction);
-static void nautilus_undo_manager_undo (NautilusUndoManager *manager);
+static void impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant,
+ const Nautilus_Undo_Transaction transaction,
+ CORBA_Environment *ev);
+static void impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant,
+ const Nautilus_Undo_Transaction transaction,
+ CORBA_Environment *ev);
+static void impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant,
+ CORBA_Environment *ev);
+static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
+ Nautilus_Undo_Transaction transaction);
+static void nautilus_undo_manager_forget_transaction (NautilusUndoManager *manager,
+ Nautilus_Undo_Transaction transaction);
+static void nautilus_undo_manager_undo (NautilusUndoManager *manager);
NAUTILUS_DEFINE_CLASS_BOILERPLATE(NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE)
@@ -158,8 +160,8 @@ impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant,
manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object;
g_assert (NAUTILUS_IS_UNDO_MANAGER (manager));
-
- /* FIXME: Need to implement this. */
+
+ nautilus_undo_manager_forget_transaction (manager, transaction);
}
static void
@@ -322,7 +324,7 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager));
g_return_if_fail (transaction != CORBA_OBJECT_NIL);
- CORBA_exception_init(&ev);
+ CORBA_exception_init (&ev);
/* Check and see if we are over our queue limit */
length = g_list_length (manager->details->undo_list);
if (length >= manager->details->queue_depth) {
@@ -342,57 +344,34 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
gtk_signal_emit (GTK_OBJECT (manager),
signals[UNDO_TRANSACTION_OCCURRED]);
- CORBA_exception_free(&ev);
+ CORBA_exception_free (&ev);
}
-/* nautilus_undo_manager_unregister_object
- *
- * Remove any transaction with object as target from
- * the undo and redo queues
- */
-gboolean
-nautilus_undo_manager_unregister_object (GtkObject *object)
+
+static void
+nautilus_undo_manager_forget_transaction (NautilusUndoManager *manager,
+ Nautilus_Undo_Transaction transaction)
{
- Nautilus_Undo_Manager manager;
- gboolean success;
-/*
GList *list;
int index, length;
- Nautilus_Undo_Transaction transaction;
CORBA_Environment ev;
-
- CORBA_exception_init (&ev);
-*/
-
- /* FIXME: We can't get a pointer to the actual undo manager, so this
- * needs to work through the CORBA interface to the undo manager.
- * Also there's no reason to assume that this object will have the
- * right one.
- */
- manager = nautilus_get_undo_manager (object);
- if (manager == NULL) {
- return FALSE;
- }
+ gboolean success;
+
+ CORBA_exception_init (&ev);
success = FALSE;
/* Check undo list */
- /* FIXME: We need a way to do this */
-#if 0
length = g_list_length (manager->details->undo_list);
for (index = 0; index < length; index++) {
list = g_list_nth (manager->details->undo_list, index);
if (list) {
transaction = list->data;
- if (nautilus_undo_transaction_contains_object (transaction, object)) {
manager->details->undo_list =
- g_list_remove (manager->details->undo_list, transaction);
-
- Nautilus_Undo_Transaction_unref (transaction, &ev);
-
- index--;
+ g_list_remove (manager->details->undo_list, transaction);
+ Nautilus_Undo_Transaction_unref (transaction, &ev);
success = TRUE;
- }
+ index--;
}
}
@@ -402,28 +381,24 @@ nautilus_undo_manager_unregister_object (GtkObject *object)
list = g_list_nth (manager->details->redo_list, index);
if (list) {
transaction = list->data;
- if (nautilus_undo_transaction_contains_object(transaction, object)) {
manager->details->redo_list =
- g_list_remove (manager->details->redo_list, transaction);
-
- Nautilus_Undo_Transaction_unref (transaction, &ev);
-
- index--;
+ g_list_remove (manager->details->redo_list, transaction);
+ Nautilus_Undo_Transaction_unref (transaction, &ev);
success = TRUE;
- }
+ index--;
}
}
-#endif
-
+
if (success) {
/* Fire off signal informing that a transaction has occurred */
gtk_signal_emit (GTK_OBJECT (manager),
signals[UNDO_TRANSACTION_OCCURRED]);
}
- return success;
+ CORBA_exception_free (&ev);
}
+
gboolean
nautilus_undo_manager_can_undo (NautilusUndoManager *manager)
{
diff --git a/libnautilus-extensions/nautilus-undo-manager.h b/libnautilus-extensions/nautilus-undo-manager.h
index 9571c7a4c..671acbeb2 100644
--- a/libnautilus-extensions/nautilus-undo-manager.h
+++ b/libnautilus-extensions/nautilus-undo-manager.h
@@ -67,7 +67,7 @@ void nautilus_undo_manager_enable_redo (NautilusUndoManag
gboolean value);
void nautilus_undo_manager_set_queue_depth (NautilusUndoManager *manager,
gint depth);
-gboolean nautilus_undo_manager_unregister_object (GtkObject *object);
+
void nautilus_attach_undo_manager (GtkObject *object,
Nautilus_Undo_Manager manager);
void nautilus_share_undo_manager (GtkObject *destination_object,
diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c
index e88bf0ee9..ee6dd5886 100644
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@@ -270,7 +270,8 @@ nautilus_entry_enable_undo (NautilusEntry *entry, gboolean value)
update_undo_text (entry);
}
} else {
- nautilus_undo_unregister (GTK_OBJECT (entry));
+ /* FIXME */
+ /* nautilus_undo_unregister (GTK_OBJECT (entry)); */
}
}
diff --git a/libnautilus-private/nautilus-undo-manager.c b/libnautilus-private/nautilus-undo-manager.c
index 46271096a..0a1ced957 100644
--- a/libnautilus-private/nautilus-undo-manager.c
+++ b/libnautilus-private/nautilus-undo-manager.c
@@ -54,24 +54,26 @@ typedef struct {
} impl_POA_Nautilus_Undo_Manager;
/* GtkObject */
-static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class);
-static void nautilus_undo_manager_initialize (NautilusUndoManager *item);
-static void destroy (GtkObject *object);
-static void free_undo_manager_list (GList *list);
-static GList *prune_undo_manager_list (GList *list,
- int items);
+static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class);
+static void nautilus_undo_manager_initialize (NautilusUndoManager *item);
+static void destroy (GtkObject *object);
+static void free_undo_manager_list (GList *list);
+static GList *prune_undo_manager_list (GList *list,
+ int items);
/* CORBA/Bonobo */
-static void impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant,
- const Nautilus_Undo_Transaction transaction,
- CORBA_Environment *ev);
-static void impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant,
- const Nautilus_Undo_Transaction transaction,
- CORBA_Environment *ev);
-static void impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant,
- CORBA_Environment *ev);
-static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
- Nautilus_Undo_Transaction transaction);
-static void nautilus_undo_manager_undo (NautilusUndoManager *manager);
+static void impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant,
+ const Nautilus_Undo_Transaction transaction,
+ CORBA_Environment *ev);
+static void impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant,
+ const Nautilus_Undo_Transaction transaction,
+ CORBA_Environment *ev);
+static void impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant,
+ CORBA_Environment *ev);
+static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
+ Nautilus_Undo_Transaction transaction);
+static void nautilus_undo_manager_forget_transaction (NautilusUndoManager *manager,
+ Nautilus_Undo_Transaction transaction);
+static void nautilus_undo_manager_undo (NautilusUndoManager *manager);
NAUTILUS_DEFINE_CLASS_BOILERPLATE(NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE)
@@ -158,8 +160,8 @@ impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant,
manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object;
g_assert (NAUTILUS_IS_UNDO_MANAGER (manager));
-
- /* FIXME: Need to implement this. */
+
+ nautilus_undo_manager_forget_transaction (manager, transaction);
}
static void
@@ -322,7 +324,7 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager));
g_return_if_fail (transaction != CORBA_OBJECT_NIL);
- CORBA_exception_init(&ev);
+ CORBA_exception_init (&ev);
/* Check and see if we are over our queue limit */
length = g_list_length (manager->details->undo_list);
if (length >= manager->details->queue_depth) {
@@ -342,57 +344,34 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
gtk_signal_emit (GTK_OBJECT (manager),
signals[UNDO_TRANSACTION_OCCURRED]);
- CORBA_exception_free(&ev);
+ CORBA_exception_free (&ev);
}
-/* nautilus_undo_manager_unregister_object
- *
- * Remove any transaction with object as target from
- * the undo and redo queues
- */
-gboolean
-nautilus_undo_manager_unregister_object (GtkObject *object)
+
+static void
+nautilus_undo_manager_forget_transaction (NautilusUndoManager *manager,
+ Nautilus_Undo_Transaction transaction)
{
- Nautilus_Undo_Manager manager;
- gboolean success;
-/*
GList *list;
int index, length;
- Nautilus_Undo_Transaction transaction;
CORBA_Environment ev;
-
- CORBA_exception_init (&ev);
-*/
-
- /* FIXME: We can't get a pointer to the actual undo manager, so this
- * needs to work through the CORBA interface to the undo manager.
- * Also there's no reason to assume that this object will have the
- * right one.
- */
- manager = nautilus_get_undo_manager (object);
- if (manager == NULL) {
- return FALSE;
- }
+ gboolean success;
+
+ CORBA_exception_init (&ev);
success = FALSE;
/* Check undo list */
- /* FIXME: We need a way to do this */
-#if 0
length = g_list_length (manager->details->undo_list);
for (index = 0; index < length; index++) {
list = g_list_nth (manager->details->undo_list, index);
if (list) {
transaction = list->data;
- if (nautilus_undo_transaction_contains_object (transaction, object)) {
manager->details->undo_list =
- g_list_remove (manager->details->undo_list, transaction);
-
- Nautilus_Undo_Transaction_unref (transaction, &ev);
-
- index--;
+ g_list_remove (manager->details->undo_list, transaction);
+ Nautilus_Undo_Transaction_unref (transaction, &ev);
success = TRUE;
- }
+ index--;
}
}
@@ -402,28 +381,24 @@ nautilus_undo_manager_unregister_object (GtkObject *object)
list = g_list_nth (manager->details->redo_list, index);
if (list) {
transaction = list->data;
- if (nautilus_undo_transaction_contains_object(transaction, object)) {
manager->details->redo_list =
- g_list_remove (manager->details->redo_list, transaction);
-
- Nautilus_Undo_Transaction_unref (transaction, &ev);
-
- index--;
+ g_list_remove (manager->details->redo_list, transaction);
+ Nautilus_Undo_Transaction_unref (transaction, &ev);
success = TRUE;
- }
+ index--;
}
}
-#endif
-
+
if (success) {
/* Fire off signal informing that a transaction has occurred */
gtk_signal_emit (GTK_OBJECT (manager),
signals[UNDO_TRANSACTION_OCCURRED]);
}
- return success;
+ CORBA_exception_free (&ev);
}
+
gboolean
nautilus_undo_manager_can_undo (NautilusUndoManager *manager)
{
diff --git a/libnautilus-private/nautilus-undo-manager.h b/libnautilus-private/nautilus-undo-manager.h
index 9571c7a4c..671acbeb2 100644
--- a/libnautilus-private/nautilus-undo-manager.h
+++ b/libnautilus-private/nautilus-undo-manager.h
@@ -67,7 +67,7 @@ void nautilus_undo_manager_enable_redo (NautilusUndoManag
gboolean value);
void nautilus_undo_manager_set_queue_depth (NautilusUndoManager *manager,
gint depth);
-gboolean nautilus_undo_manager_unregister_object (GtkObject *object);
+
void nautilus_attach_undo_manager (GtkObject *object,
Nautilus_Undo_Manager manager);
void nautilus_share_undo_manager (GtkObject *destination_object,
diff --git a/libnautilus/nautilus-undo-manager.c b/libnautilus/nautilus-undo-manager.c
index 46271096a..0a1ced957 100644
--- a/libnautilus/nautilus-undo-manager.c
+++ b/libnautilus/nautilus-undo-manager.c
@@ -54,24 +54,26 @@ typedef struct {
} impl_POA_Nautilus_Undo_Manager;
/* GtkObject */
-static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class);
-static void nautilus_undo_manager_initialize (NautilusUndoManager *item);
-static void destroy (GtkObject *object);
-static void free_undo_manager_list (GList *list);
-static GList *prune_undo_manager_list (GList *list,
- int items);
+static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class);
+static void nautilus_undo_manager_initialize (NautilusUndoManager *item);
+static void destroy (GtkObject *object);
+static void free_undo_manager_list (GList *list);
+static GList *prune_undo_manager_list (GList *list,
+ int items);
/* CORBA/Bonobo */
-static void impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant,
- const Nautilus_Undo_Transaction transaction,
- CORBA_Environment *ev);
-static void impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant,
- const Nautilus_Undo_Transaction transaction,
- CORBA_Environment *ev);
-static void impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant,
- CORBA_Environment *ev);
-static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
- Nautilus_Undo_Transaction transaction);
-static void nautilus_undo_manager_undo (NautilusUndoManager *manager);
+static void impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant,
+ const Nautilus_Undo_Transaction transaction,
+ CORBA_Environment *ev);
+static void impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant,
+ const Nautilus_Undo_Transaction transaction,
+ CORBA_Environment *ev);
+static void impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant,
+ CORBA_Environment *ev);
+static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
+ Nautilus_Undo_Transaction transaction);
+static void nautilus_undo_manager_forget_transaction (NautilusUndoManager *manager,
+ Nautilus_Undo_Transaction transaction);
+static void nautilus_undo_manager_undo (NautilusUndoManager *manager);
NAUTILUS_DEFINE_CLASS_BOILERPLATE(NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE)
@@ -158,8 +160,8 @@ impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant,
manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object;
g_assert (NAUTILUS_IS_UNDO_MANAGER (manager));
-
- /* FIXME: Need to implement this. */
+
+ nautilus_undo_manager_forget_transaction (manager, transaction);
}
static void
@@ -322,7 +324,7 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager));
g_return_if_fail (transaction != CORBA_OBJECT_NIL);
- CORBA_exception_init(&ev);
+ CORBA_exception_init (&ev);
/* Check and see if we are over our queue limit */
length = g_list_length (manager->details->undo_list);
if (length >= manager->details->queue_depth) {
@@ -342,57 +344,34 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager,
gtk_signal_emit (GTK_OBJECT (manager),
signals[UNDO_TRANSACTION_OCCURRED]);
- CORBA_exception_free(&ev);
+ CORBA_exception_free (&ev);
}
-/* nautilus_undo_manager_unregister_object
- *
- * Remove any transaction with object as target from
- * the undo and redo queues
- */
-gboolean
-nautilus_undo_manager_unregister_object (GtkObject *object)
+
+static void
+nautilus_undo_manager_forget_transaction (NautilusUndoManager *manager,
+ Nautilus_Undo_Transaction transaction)
{
- Nautilus_Undo_Manager manager;
- gboolean success;
-/*
GList *list;
int index, length;
- Nautilus_Undo_Transaction transaction;
CORBA_Environment ev;
-
- CORBA_exception_init (&ev);
-*/
-
- /* FIXME: We can't get a pointer to the actual undo manager, so this
- * needs to work through the CORBA interface to the undo manager.
- * Also there's no reason to assume that this object will have the
- * right one.
- */
- manager = nautilus_get_undo_manager (object);
- if (manager == NULL) {
- return FALSE;
- }
+ gboolean success;
+
+ CORBA_exception_init (&ev);
success = FALSE;
/* Check undo list */
- /* FIXME: We need a way to do this */
-#if 0
length = g_list_length (manager->details->undo_list);
for (index = 0; index < length; index++) {
list = g_list_nth (manager->details->undo_list, index);
if (list) {
transaction = list->data;
- if (nautilus_undo_transaction_contains_object (transaction, object)) {
manager->details->undo_list =
- g_list_remove (manager->details->undo_list, transaction);
-
- Nautilus_Undo_Transaction_unref (transaction, &ev);
-
- index--;
+ g_list_remove (manager->details->undo_list, transaction);
+ Nautilus_Undo_Transaction_unref (transaction, &ev);
success = TRUE;
- }
+ index--;
}
}
@@ -402,28 +381,24 @@ nautilus_undo_manager_unregister_object (GtkObject *object)
list = g_list_nth (manager->details->redo_list, index);
if (list) {
transaction = list->data;
- if (nautilus_undo_transaction_contains_object(transaction, object)) {
manager->details->redo_list =
- g_list_remove (manager->details->redo_list, transaction);
-
- Nautilus_Undo_Transaction_unref (transaction, &ev);
-
- index--;
+ g_list_remove (manager->details->redo_list, transaction);
+ Nautilus_Undo_Transaction_unref (transaction, &ev);
success = TRUE;
- }
+ index--;
}
}
-#endif
-
+
if (success) {
/* Fire off signal informing that a transaction has occurred */
gtk_signal_emit (GTK_OBJECT (manager),
signals[UNDO_TRANSACTION_OCCURRED]);
}
- return success;
+ CORBA_exception_free (&ev);
}
+
gboolean
nautilus_undo_manager_can_undo (NautilusUndoManager *manager)
{
diff --git a/libnautilus/nautilus-undo-manager.h b/libnautilus/nautilus-undo-manager.h
index 9571c7a4c..671acbeb2 100644
--- a/libnautilus/nautilus-undo-manager.h
+++ b/libnautilus/nautilus-undo-manager.h
@@ -67,7 +67,7 @@ void nautilus_undo_manager_enable_redo (NautilusUndoManag
gboolean value);
void nautilus_undo_manager_set_queue_depth (NautilusUndoManager *manager,
gint depth);
-gboolean nautilus_undo_manager_unregister_object (GtkObject *object);
+
void nautilus_attach_undo_manager (GtkObject *object,
Nautilus_Undo_Manager manager);
void nautilus_share_undo_manager (GtkObject *destination_object,
diff --git a/libnautilus/nautilus-undoable.c b/libnautilus/nautilus-undoable.c
index 3cf80207b..be701e9f3 100644
--- a/libnautilus/nautilus-undoable.c
+++ b/libnautilus/nautilus-undoable.c
@@ -48,8 +48,8 @@ static guint signals[LAST_SIGNAL];
/* GtkObject */
static void nautilus_undoable_initialize_class (NautilusUndoableClass *class);
static void nautilus_undoable_initialize (NautilusUndoable *item);
-static void destroy (GtkObject *object);
-
+static void destroy (GtkObject *object);
+static void nautilus_undo_unregister (GtkObject *target);
NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusUndoable, nautilus_undoable, GTK_TYPE_OBJECT)
@@ -315,7 +315,7 @@ nautilus_undo_register_full (GList *atoms,
}
/* Cover for forgetting about all undo relating to a particular target. */
-void
+static void
nautilus_undo_unregister (GtkObject *target)
{
g_return_if_fail (GTK_IS_OBJECT (target));
@@ -324,7 +324,6 @@ nautilus_undo_unregister (GtkObject *target)
* FIXME: We will have to figure out which transactions this affects
* and remove ourselves from them. It's not clear how to do that.
*/
- nautilus_undo_manager_unregister_object (target);
/* Perhaps this should also unregister all children if called on a
* GtkContainer? That might be handy.
diff --git a/libnautilus/nautilus-undoable.h b/libnautilus/nautilus-undoable.h
index 753060421..2af3ccfa6 100644
--- a/libnautilus/nautilus-undoable.h
+++ b/libnautilus/nautilus-undoable.h
@@ -100,7 +100,6 @@ void nautilus_undo_register_full (GList *atoms,
const char *undo_menu_item_description,
const char *redo_menu_item_name,
const char *redo_menu_item_description);
-void nautilus_undo_unregister (GtkObject *target);
/* Performing an undo explicitly. Only for use by objects "out in the field".
* The menu bar itself uses a richer API in the undo manager.
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 53dcea2ff..4a3fe5f85 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -288,7 +288,7 @@ nautilus_window_request_title_change (NautilusWindow *window,
const char *new_title,
NautilusViewFrame *requesting_view)
{
- g_return_if_fail (NAUTILUS_IS_WINDOW (widnow));
+ g_return_if_fail (NAUTILUS_IS_WINDOW (window));
g_return_if_fail (new_title != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (requesting_view));
diff --git a/src/ntl-window-msgs.c b/src/ntl-window-msgs.c
index 53dcea2ff..4a3fe5f85 100644
--- a/src/ntl-window-msgs.c
+++ b/src/ntl-window-msgs.c
@@ -288,7 +288,7 @@ nautilus_window_request_title_change (NautilusWindow *window,
const char *new_title,
NautilusViewFrame *requesting_view)
{
- g_return_if_fail (NAUTILUS_IS_WINDOW (widnow));
+ g_return_if_fail (NAUTILUS_IS_WINDOW (window));
g_return_if_fail (new_title != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (requesting_view));
View Lorry Controller Status