[nautilus] all: remove unused NautilusUndoManager objects



commit d5a9299fc58e646bfbdb8ede8eabb0b9e786eb5e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Apr 24 11:13:37 2012 -0400

    all: remove unused NautilusUndoManager objects
    
    This was some sort of GtkEditable undo framework in the past, but it's
    basically just unused code now.

 libnautilus-private/Makefile.am                    |    9 -
 libnautilus-private/nautilus-entry.c               |    3 -
 libnautilus-private/nautilus-undo-manager.c        |  204 --------------
 libnautilus-private/nautilus-undo-manager.h        |   70 -----
 .../nautilus-undo-signal-handlers.c                |  269 ------------------
 .../nautilus-undo-signal-handlers.h                |   35 ---
 libnautilus-private/nautilus-undo-transaction.c    |  288 --------------------
 libnautilus-private/nautilus-undo-transaction.h    |   78 ------
 libnautilus-private/nautilus-undo.c                |  205 --------------
 libnautilus-private/nautilus-undo.h                |   76 -----
 src/nautilus-application.c                         |    7 -
 src/nautilus-application.h                         |    4 -
 src/nautilus-bookmarks-window.c                    |    4 +-
 src/nautilus-properties-window.c                   |   16 -
 src/nautilus-window-bookmarks.c                    |    1 -
 src/nautilus-window-menus.c                        |    1 -
 src/nautilus-window.c                              |    1 -
 17 files changed, 1 insertions(+), 1270 deletions(-)
---
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 8c93c1a..8c7c94d 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -176,15 +176,6 @@ libnautilus_private_la_SOURCES = \
 	nautilus-tree-view-drag-dest.h \
 	nautilus-ui-utilities.c \
 	nautilus-ui-utilities.h \
-	nautilus-undo-manager.c \
-	nautilus-undo-manager.h \
-	nautilus-undo-private.h \
-	nautilus-undo-signal-handlers.c \
-	nautilus-undo-signal-handlers.h \
-	nautilus-undo-transaction.c \
-	nautilus-undo-transaction.h \
-	nautilus-undo.c \
-	nautilus-undo.h \
 	nautilus-vfs-directory.c \
 	nautilus-vfs-directory.h \
 	nautilus-vfs-file.c \
diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c
index 9c65bb1..889f86b 100644
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@@ -29,7 +29,6 @@
 
 #include <string.h>
 #include "nautilus-global-preferences.h"
-#include "nautilus-undo-signal-handlers.h"
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
@@ -62,8 +61,6 @@ nautilus_entry_init (NautilusEntry *entry)
 	entry->details = g_new0 (NautilusEntryDetails, 1);
 	
 	entry->details->user_edit = TRUE;
-
-	nautilus_undo_set_up_nautilus_entry_for_undo (entry);
 }
 
 GtkWidget *
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 32770d0..f1d21a0 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -61,7 +61,6 @@
 #include <libnautilus-private/nautilus-module.h>
 #include <libnautilus-private/nautilus-signaller.h>
 #include <libnautilus-private/nautilus-ui-utilities.h>
-#include <libnautilus-private/nautilus-undo-manager.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
 
 #define DEBUG_FLAG NAUTILUS_DEBUG_APPLICATION
@@ -511,8 +510,6 @@ nautilus_application_create_window (NautilusApplication *application,
 	}
 	g_free (geometry_string);
 
-	nautilus_undo_manager_attach (application->undo_manager, G_OBJECT (window));
-
 	DEBUG ("Creating a new navigation window");
 	
 	return window;
@@ -909,7 +906,6 @@ nautilus_application_finalize (GObject *object)
 
 	nautilus_bookmarks_exiting ();
 
-	g_clear_object (&application->undo_manager);
 	g_clear_object (&application->priv->volume_monitor);
 	g_clear_object (&application->priv->progress_handler);
 
@@ -1204,9 +1200,6 @@ nautilus_application_startup (GApplication *app)
 	/* initialize the previewer singleton */
 	nautilus_previewer_get_singleton ();
 
-	/* create an undo manager */
-	self->undo_manager = nautilus_undo_manager_new ();
-
 	/* create DBus manager */
 	nautilus_dbus_manager_start (app);
 	nautilus_freedesktop_dbus_start (self);
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index fd1885b..53b5897 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -28,8 +28,6 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include <libnautilus-private/nautilus-undo-manager.h>
-
 #include "nautilus-window.h"
 
 #define NAUTILUS_DESKTOP_ICON_VIEW_IID	"OAFIID:Nautilus_File_Manager_Desktop_Icon_View"
@@ -56,8 +54,6 @@ typedef struct _NautilusApplicationPriv NautilusApplicationPriv;
 typedef struct {
 	GtkApplication parent;
 
-	NautilusUndoManager *undo_manager;
-
 	NautilusApplicationPriv *priv;
 } NautilusApplication;
 
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index 872a46f..c6932ce 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -27,11 +27,10 @@
 
 #include <config.h>
 #include "nautilus-bookmarks-window.h"
+#include "nautilus-entry.h"
 #include "nautilus-window.h"
 
-#include <libnautilus-private/nautilus-undo.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-undo-signal-handlers.h>
 
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gnome-extensions.h>
@@ -266,7 +265,6 @@ create_bookmarks_window (NautilusBookmarkList *list, GObject *undo_manager_sourc
 	jump_button = (GtkWidget *)gtk_builder_get_object (builder, "bookmark_jump_button");
 
 	set_up_close_accelerator (window);
-	nautilus_undo_share_undo_manager (G_OBJECT (window), undo_manager_source);
 
 	gtk_window_set_wmclass (GTK_WINDOW (window), "bookmarks", "Nautilus");
 	nautilus_bookmarks_window_restore_geometry (window);
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index d99105a..db3b2eb 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -58,8 +58,6 @@
 #include <libnautilus-private/nautilus-metadata.h>
 #include <libnautilus-private/nautilus-mime-application-chooser.h>
 #include <libnautilus-private/nautilus-module.h>
-#include <libnautilus-private/nautilus-undo-signal-handlers.h>
-#include <libnautilus-private/nautilus-undo.h>
 
 #if HAVE_SYS_VFS_H
 #include <sys/vfs.h>
@@ -586,20 +584,6 @@ set_name_field (NautilusPropertiesWindow *window,
 						 GTK_WIDGET (window->details->name_label),
 						 GTK_POS_RIGHT, 1, 1);
 			gtk_label_set_mnemonic_widget (GTK_LABEL (window->details->name_label), window->details->name_field);
-			
-			/* FIXME bugzilla.gnome.org 42151:
-			 * With this (and one place elsewhere in this file, not sure which is the
-			 * trouble-causer) code in place, bug 2151 happens (crash on quit). Since
-			 * we've removed Undo from Nautilus for now, I'm just ifdeffing out this
-			 * code rather than trying to fix 2151 now. Note that it might be possible
-			 * to fix 2151 without making Undo actually work, it's just not worth the
-			 * trouble.
-			 */
-#ifdef UNDO_ENABLED
-			/* Set up name field for undo */
-			nautilus_undo_set_up_nautilus_entry_for_undo ( NAUTILUS_ENTRY (window->details->name_field));
-			nautilus_undo_editable_set_undo_key (GTK_EDITABLE (window->details->name_field), TRUE);
-#endif
 
 			g_signal_connect_object (window->details->name_field, "focus_out_event",
 						 G_CALLBACK (name_field_focus_out), window, 0);
diff --git a/src/nautilus-window-bookmarks.c b/src/nautilus-window-bookmarks.c
index c7aa72c..18b5e3a 100644
--- a/src/nautilus-window-bookmarks.c
+++ b/src/nautilus-window-bookmarks.c
@@ -33,7 +33,6 @@
 #include "nautilus-bookmarks-window.h"
 #include "nautilus-window-bookmarks.h"
 #include "nautilus-window-private.h"
-#include <libnautilus-private/nautilus-undo-manager.h>
 #include <libnautilus-private/nautilus-ui-utilities.h>
 #include <eel/eel-debug.h>
 #include <eel/eel-stock-dialogs.h>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 133c4f7..24292c5 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -53,7 +53,6 @@
 #include <libnautilus-private/nautilus-icon-names.h>
 #include <libnautilus-private/nautilus-ui-utilities.h>
 #include <libnautilus-private/nautilus-module.h>
-#include <libnautilus-private/nautilus-undo-manager.h>
 #include <libnautilus-private/nautilus-program-choosing.h>
 #include <libnautilus-private/nautilus-search-directory.h>
 #include <libnautilus-private/nautilus-search-engine.h>
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index c1b71ab..63075d1 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -60,7 +60,6 @@
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-metadata.h>
 #include <libnautilus-private/nautilus-clipboard.h>
-#include <libnautilus-private/nautilus-undo.h>
 #include <libnautilus-private/nautilus-search-directory.h>
 #include <libnautilus-private/nautilus-signaller.h>
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]