GNOME.org
 

An experiment in removing nautilus-undo and other unused bits

Hi.

I noticed that the stuff in cut-n-paste/widgets/gimpwrapbox was unused
today while looking at removing unneeded bonobo headers. And later on it
became clear that the bonoboui parts that are still in the source are
mostly there because of the undo stuff in libnautilus-private so I took
a stab at removing those too since the feature was never completed and
bonobo has been removed from other parts of nautilus.

I'm attaching a patch that tries to get rid of all uses of
libnautilus-private/nautilus-undo-*.

Known problems are that the jump to button in the bookmarks editor
crashes. Same goes for activating a bookmark from the list. The reason
is simply that I removed the undo_manager_source argument from one of
the functions and that results in passing 0x0 user_data to
open_selected_bookmark() and friends. Anyone got a clue how I can fix
this in a more correct way?

Cheers
Kjartan


Index: src/nautilus-window-menus.c
===================================================================
--- src/nautilus-window-menus.c	(revisjon 12763)
+++ src/nautilus-window-menus.c	(arbeidskopi)
@@ -51,6 +51,10 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtkaboutdialog.h>
 #include <gtk/gtkenums.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtkstatusbar.h>
+#include <gtk/gtktoolbutton.h>
 #include <libgnome/gnome-help.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
@@ -64,7 +68,6 @@
 #include <libnautilus-private/nautilus-ui-utilities.h>
 #include <libnautilus-private/nautilus-icon-factory.h>
 #include <libnautilus-private/nautilus-module.h>
-#include <libnautilus-private/nautilus-undo-manager.h>
 #include <libnautilus-private/nautilus-search-directory.h>
 #include <libnautilus-private/nautilus-search-engine.h>
 #include <libnautilus-private/nautilus-signaller.h>
@@ -256,14 +259,6 @@ action_stop_callback (GtkAction *action,
 }
 
 static void
-action_undo_callback (GtkAction *action, 
-		      gpointer user_data) 
-{
-	nautilus_undo_manager_undo
-		(NAUTILUS_WINDOW (user_data)->application->undo_manager);
-}
-
-static void
 action_home_callback (GtkAction *action, 
 		      gpointer user_data) 
 {
@@ -599,9 +594,6 @@ static const GtkActionEntry main_entries
     N_("Prefere_nces"),               
     NULL, N_("Edit Nautilus preferences"),
     G_CALLBACK (action_preferences_callback) },
-  { "Undo", NULL, N_("_Undo"),               /* name, stock id, label */
-    "<control>Z", N_("Undo the last text change"),
-    G_CALLBACK (action_undo_callback) },
   { "Up", GTK_STOCK_GO_UP, N_("Open _Parent"),               /* name, stock id, label */
     "<alt>Up", N_("Open the parent folder"),
     G_CALLBACK (action_up_callback) },
Index: src/nautilus-application.c
===================================================================
--- src/nautilus-application.c	(revisjon 12763)
+++ src/nautilus-application.c	(arbeidskopi)
@@ -83,7 +83,6 @@
 #include <libnautilus-private/nautilus-icon-factory.h>
 #include <libnautilus-private/nautilus-metafile-factory.h>
 #include <libnautilus-private/nautilus-module.h>
-#include <libnautilus-private/nautilus-undo-manager.h>
 #include <libnautilus-private/nautilus-desktop-link-monitor.h>
 #include <libnautilus-private/nautilus-directory-private.h>
 #include <libnautilus-private/nautilus-signaller.h>
@@ -171,9 +170,6 @@ nautilus_application_get_n_windows (void
 static void
 nautilus_application_instance_init (NautilusApplication *application)
 {
-	/* Create an undo manager */
-	application->undo_manager = nautilus_undo_manager_new ();
-
 	application->shell = nautilus_shell_new (application);
 	
 	/* Watch for volume mounts so we can restore open windows
@@ -228,8 +224,6 @@ nautilus_application_destroy (BonoboObje
 
 	nautilus_bookmarks_exiting ();
 	
-	g_object_unref (application->undo_manager);
-
 	if (application->shell_registered) {
 		bonobo_activation_unregister_active_server (SHELL_IID, BONOBO_OBJREF (application->shell));
 	}
Index: src/nautilus-location-entry.c
===================================================================
--- src/nautilus-location-entry.c	(revisjon 12763)
+++ src/nautilus-location-entry.c	(arbeidskopi)
@@ -40,6 +40,7 @@
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
+#include <gtk/gtklabel.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtksignal.h>
 #include <glib/gi18n.h>
Index: src/nautilus-application.h
===================================================================
--- src/nautilus-application.h	(revisjon 12763)
+++ src/nautilus-application.h	(arbeidskopi)
@@ -29,7 +29,6 @@
 
 #include <gdk/gdk.h>
 #include <bonobo/bonobo-generic-factory.h>
-#include <libnautilus-private/nautilus-undo-manager.h>
 
 #define NAUTILUS_DESKTOP_ICON_VIEW_IID	"OAFIID:Nautilus_File_Manager_Desktop_Icon_View"
 
@@ -53,7 +52,6 @@ typedef struct NautilusShell NautilusShe
 
 typedef struct {
 	BonoboGenericFactory parent;
-	NautilusUndoManager *undo_manager;
 	NautilusShell *shell;
 	gboolean shell_registered;
 } NautilusApplication;
Index: src/nautilus-window-private.h
===================================================================
--- src/nautilus-window-private.h	(revisjon 12763)
+++ src/nautilus-window-private.h	(arbeidskopi)
@@ -32,9 +32,8 @@
 #include "nautilus-spatial-window.h"
 #include "nautilus-navigation-window.h"
 
-#include <bonobo/bonobo-ui-component.h>
-#include <bonobo/bonobo-ui-container.h>
-#include <bonobo/bonobo-ui-toolbar-button-item.h>
+#include <gtk/gtkradioaction.h>
+#include <gtk/gtkactiongroup.h>
 #include <libnautilus-private/nautilus-directory.h>
 
 typedef enum {
Index: src/nautilus-navigation-window-menus.c
===================================================================
--- src/nautilus-navigation-window-menus.c	(revisjon 12763)
+++ src/nautilus-navigation-window-menus.c	(arbeidskopi)
@@ -47,6 +47,7 @@
 #include <eel/eel-xml-extensions.h>
 #include <libxml/parser.h>
 #include <gtk/gtkmain.h>
+#include <gtk/gtkstock.h>
 #include <libgnome/gnome-help.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
@@ -58,7 +59,6 @@
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-ui-utilities.h>
 #include <libnautilus-private/nautilus-icon-factory.h>
-#include <libnautilus-private/nautilus-undo-manager.h>
 #include <libnautilus-private/nautilus-search-engine.h>
 #include <libnautilus-private/nautilus-signaller.h>
 
Index: src/file-manager/fm-properties-window.c
===================================================================
--- src/file-manager/fm-properties-window.c	(revisjon 12763)
+++ src/file-manager/fm-properties-window.c	(arbeidskopi)
@@ -77,9 +77,7 @@
 #include <libnautilus-private/nautilus-link.h>
 #include <libnautilus-private/nautilus-metadata.h>
 #include <libnautilus-private/nautilus-module.h>
-#include <libnautilus-private/nautilus-undo-signal-handlers.h>
 #include <libnautilus-private/nautilus-mime-actions.h>
-#include <libnautilus-private/nautilus-undo.h>
 #include <string.h>
 
 #define PREVIEW_IMAGE_WIDTH 96
@@ -610,20 +608,6 @@ set_name_field (FMPropertiesWindow *wind
 					  0, 0);
 			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);
 			g_signal_connect_object (window->details->name_field, "activate",
@@ -4703,13 +4687,6 @@ is_directory_ready_callback (NautilusFil
 		
 		remove_pending (startup_data, FALSE, TRUE, TRUE);
 		
-/* FIXME bugzilla.gnome.org 42151:
- * See comment elsewhere in this file about bug 2151.
- */
-#ifdef UNDO_ENABLED
-		nautilus_undo_share_undo_manager (GTK_OBJECT (new_window),
-						  GTK_OBJECT (callback_data));
-#endif	
 		gtk_window_present (GTK_WINDOW (new_window));
 	}
 }
Index: src/nautilus-navigation-window.c
===================================================================
--- src/nautilus-navigation-window.c	(revisjon 12763)
+++ src/nautilus-navigation-window.c	(arbeidskopi)
@@ -76,7 +76,6 @@
 #include <libnautilus-private/nautilus-sidebar.h>
 #include <libnautilus-private/nautilus-view-factory.h>
 #include <libnautilus-private/nautilus-clipboard.h>
-#include <libnautilus-private/nautilus-undo.h>
 #include <libnautilus-private/nautilus-module.h>
 #include <libnautilus-private/nautilus-sidebar-provider.h>
 #include <libnautilus-private/nautilus-search-directory.h>
Index: src/nautilus-navigation-window.h
===================================================================
--- src/nautilus-navigation-window.h	(revisjon 12763)
+++ src/nautilus-navigation-window.h	(arbeidskopi)
@@ -30,7 +30,6 @@
 #ifndef NAUTILUS_NAVIGATION_WINDOW_H
 #define NAUTILUS_NAVIGATION_WINDOW_H
 
-#include <bonobo/bonobo-window.h>
 #include <gtk/gtktoolitem.h>
 #include <eel/eel-glib-extensions.h>
 #include <libnautilus-private/nautilus-bookmark.h>
Index: src/nautilus-spatial-window.c
===================================================================
--- src/nautilus-spatial-window.c	(revisjon 12763)
+++ src/nautilus-spatial-window.c	(arbeidskopi)
@@ -53,6 +53,11 @@
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkuimanager.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtkarrow.h>
+#include <gtk/gtkbindings.h>
+#include <gtk/gtktable.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-macros.h>
 #include <libgnomeui/gnome-uidefs.h>
@@ -68,7 +73,6 @@
 #include <libnautilus-private/nautilus-metadata.h>
 #include <libnautilus-private/nautilus-mime-actions.h>
 #include <libnautilus-private/nautilus-program-choosing.h>
-#include <libnautilus-private/nautilus-undo.h>
 #include <libnautilus-private/nautilus-search-directory.h>
 #include <libnautilus-private/nautilus-search-engine.h>
 #include <libnautilus-private/nautilus-signaller.h>
Index: src/nautilus-window.c
===================================================================
--- src/nautilus-window.c	(revisjon 12763)
+++ src/nautilus-window.c	(arbeidskopi)
@@ -47,9 +47,14 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtkaccelmap.h>
+#include <gtk/gtkbindings.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmenubar.h>
 #include <gtk/gtkmenuitem.h>
+#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtkstatusbar.h>
+#include <gtk/gtktable.h>
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkvbox.h>
 #include <glib/gi18n.h>
@@ -67,7 +72,6 @@
 #include <libnautilus-private/nautilus-program-choosing.h>
 #include <libnautilus-private/nautilus-view-factory.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>
 #include <math.h>
@@ -541,7 +545,6 @@ nautilus_window_constructed (NautilusWin
 	g_return_if_fail (NAUTILUS_IS_WINDOW (window));
 
 	nautilus_window_set_initial_window_geometry (window);
-	nautilus_undo_manager_attach (window->application->undo_manager, G_OBJECT (window));
 }
 
 static void
Index: src/nautilus-bookmarks-window.c
===================================================================
--- src/nautilus-bookmarks-window.c	(revisjon 12763)
+++ src/nautilus-bookmarks-window.c	(arbeidskopi)
@@ -30,12 +30,11 @@
 #include "nautilus-window.h"
 #include "nautilus-navigation-window.h"
 #include "nautilus-spatial-window.h"
-#include <libnautilus-private/nautilus-undo.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
+#include <libnautilus-private/nautilus-entry.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gnome-extensions.h>
 #include <libnautilus-private/nautilus-icon-factory.h>
-#include <libnautilus-private/nautilus-undo-signal-handlers.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtkhbbox.h>
 #include <gnome.h>
@@ -219,22 +218,6 @@ bookmarks_set_empty (gboolean empty)
 	on_selection_changed (bookmark_selection, NULL);
 }
 
-static void
-edit_bookmarks_dialog_reset_signals (gpointer data,
-				     GObject *obj)
-{
-	g_signal_handler_disconnect (GTK_OBJECT (jump_button),
-				     jump_button_signal_id);
-	g_signal_handler_disconnect (GTK_OBJECT (bookmark_list_widget),
-				     row_activated_signal_id);
-	jump_button_signal_id =
-		g_signal_connect (jump_button, "clicked",
-				  G_CALLBACK (on_jump_button_clicked), NULL);
-	row_activated_signal_id =
-		g_signal_connect (bookmark_list_widget, "row_activated",
-				  G_CALLBACK (on_row_activated), NULL);
-}
-
 /**
  * create_bookmarks_window:
  * 
@@ -244,7 +227,7 @@ edit_bookmarks_dialog_reset_signals (gpo
  * Return value: A pointer to the new window.
  **/
 GtkWindow *
-create_bookmarks_window (NautilusBookmarkList *list, GObject *undo_manager_source)
+create_bookmarks_window (NautilusBookmarkList *list)
 {
 	GtkWidget         *window;
 	GtkTreeViewColumn *col;
@@ -264,23 +247,11 @@ create_bookmarks_window (NautilusBookmar
 		return NULL;
 	}
 
-	application = NAUTILUS_WINDOW (undo_manager_source)->application;
-
-	if (NAUTILUS_IS_NAVIGATION_WINDOW (undo_manager_source)) {
-		parent_is_browser_window = TRUE;
-	} else {
-		parent_is_browser_window = FALSE;
-	}
-
 	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);
 
-	g_object_weak_ref (G_OBJECT (undo_manager_source), edit_bookmarks_dialog_reset_signals, 
-			   undo_manager_source);
-	
 	bookmark_list_widget = GTK_TREE_VIEW (glade_xml_get_widget (gui, "bookmark_tree_view"));
 
 	rend = gtk_cell_renderer_pixbuf_new ();
@@ -318,7 +289,6 @@ create_bookmarks_window (NautilusBookmar
 	gtk_widget_show (name_field);
 	gtk_box_pack_start (GTK_BOX (glade_xml_get_widget (gui, "bookmark_name_placeholder")),
 			    name_field, TRUE, TRUE, 0);
-	nautilus_undo_editable_set_undo_key (GTK_EDITABLE (name_field), TRUE);
 	
 	gtk_label_set_mnemonic_widget (
 		GTK_LABEL (glade_xml_get_widget (gui, "bookmark_name_label")),
@@ -328,7 +298,6 @@ create_bookmarks_window (NautilusBookmar
 	gtk_widget_show (uri_field);
 	gtk_box_pack_start (GTK_BOX (glade_xml_get_widget (gui, "bookmark_location_placeholder")),
 			    uri_field, TRUE, TRUE, 0);
-	nautilus_undo_editable_set_undo_key (GTK_EDITABLE (uri_field), TRUE);
 
 	gtk_label_set_mnemonic_widget (
 		GTK_LABEL (glade_xml_get_widget (gui, "bookmark_location_label")),
@@ -345,7 +314,7 @@ create_bookmarks_window (NautilusBookmar
 				  G_CALLBACK (on_row_deleted), NULL);
         row_activated_signal_id =
                 g_signal_connect (bookmark_list_widget, "row_activated",
-                                  G_CALLBACK (on_row_activated), undo_manager_source);
+                                  G_CALLBACK (on_row_activated), NULL);
         key_pressed_signal_id =
                 g_signal_connect (bookmark_list_widget, "key_press_event",
                                   G_CALLBACK (on_key_pressed), NULL);
@@ -383,7 +352,7 @@ create_bookmarks_window (NautilusBookmar
 			  G_CALLBACK (on_remove_button_clicked), NULL);
 	jump_button_signal_id = 
 		g_signal_connect (jump_button, "clicked",
-				  G_CALLBACK (on_jump_button_clicked), undo_manager_source);
+				  G_CALLBACK (on_jump_button_clicked), NULL);
 
 	/* Register to find out about icon theme changes */
 	g_signal_connect_object (nautilus_icon_factory_get (), "icons_changed",
@@ -401,7 +370,7 @@ create_bookmarks_window (NautilusBookmar
 }
 
 void
-edit_bookmarks_dialog_set_signals (GObject *undo_manager_source)
+edit_bookmarks_dialog_set_signals (void)
 {
 
 	g_signal_handler_disconnect (GTK_OBJECT (jump_button), 
@@ -411,13 +380,10 @@ edit_bookmarks_dialog_set_signals (GObje
 
 	jump_button_signal_id =
 		g_signal_connect (jump_button, "clicked",
-				  G_CALLBACK (on_jump_button_clicked), undo_manager_source);
+				  G_CALLBACK (on_jump_button_clicked), NULL);
 	row_activated_signal_id =
 		g_signal_connect (bookmark_list_widget, "row_activated",
-				  G_CALLBACK (on_row_activated), undo_manager_source);
-
-	g_object_weak_ref (G_OBJECT (undo_manager_source), edit_bookmarks_dialog_reset_signals,
-			   undo_manager_source);
+				  G_CALLBACK (on_row_activated), NULL);
 }
 
 static NautilusBookmark *
@@ -889,10 +855,6 @@ on_window_hide_event (GtkWidget *widget,
 {
 	nautilus_bookmarks_window_save_geometry (GTK_WINDOW (widget));
 
-	/* Disable undo for entry widgets */
-	nautilus_undo_unregister (G_OBJECT (name_field));
-	nautilus_undo_unregister (G_OBJECT (uri_field));
-
 	/* restore_geometry only works after window is hidden */
 	g_idle_add (restore_geometry, widget);
 }
Index: src/nautilus-window-bookmarks.c
===================================================================
--- src/nautilus-window-bookmarks.c	(revisjon 12763)
+++ src/nautilus-window-bookmarks.c	(arbeidskopi)
@@ -33,11 +33,11 @@
 #include "nautilus-bookmarks-window.h"
 #include "nautilus-window-bookmarks.h"
 #include "nautilus-window-private.h"
-#include <libnautilus-private/nautilus-undo-manager.h>
 #include <eel/eel-debug.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-gtk-extensions.h>
+#include <gtk/gtkstock.h>
 
 static GtkWindow *bookmarks_window = NULL;
 static NautilusBookmarkList *bookmarks = NULL;
@@ -115,12 +115,12 @@ show_bogus_bookmark_window (NautilusWind
 }
 
 static GtkWindow *
-get_or_create_bookmarks_window (GObject *undo_manager_source)
+get_or_create_bookmarks_window (void)
 {
 	if (bookmarks_window == NULL) {
-		bookmarks_window = create_bookmarks_window (nautilus_get_bookmark_list(), undo_manager_source);
+		bookmarks_window = create_bookmarks_window (nautilus_get_bookmark_list());
 	} else {
-		edit_bookmarks_dialog_set_signals (undo_manager_source);
+		edit_bookmarks_dialog_set_signals ();
 	}
 
 	return bookmarks_window;
@@ -166,7 +166,7 @@ nautilus_window_edit_bookmarks (Nautilus
 {
 	GtkWindow *dialog;
 
-	dialog = get_or_create_bookmarks_window (G_OBJECT (window));
+	dialog = get_or_create_bookmarks_window ();
 
 	gtk_window_set_screen (
 		dialog, gtk_window_get_screen (GTK_WINDOW (window)));
Index: src/nautilus-bookmarks-window.h
===================================================================
--- src/nautilus-bookmarks-window.h	(revisjon 12763)
+++ src/nautilus-bookmarks-window.h	(arbeidskopi)
@@ -31,9 +31,8 @@
 #include <gtk/gtkwindow.h>
 #include "nautilus-bookmark-list.h"
 
-GtkWindow *create_bookmarks_window                 (NautilusBookmarkList *bookmarks,
-						    GObject              *undo_manager_source);
+GtkWindow *create_bookmarks_window                 (NautilusBookmarkList *bookmarks);
 void       nautilus_bookmarks_window_save_geometry (GtkWindow            *window);
-void	   edit_bookmarks_dialog_set_signals	   (GObject 		 *undo_manager_source);
+void	   edit_bookmarks_dialog_set_signals	   (void);
 
 #endif /* NAUTILUS_BOOKMARKS_WINDOW_H */
Index: configure.in
===================================================================
--- configure.in	(revisjon 12763)
+++ configure.in	(arbeidskopi)
@@ -332,11 +332,6 @@ fi
 
 dnl ==========================================================================
 
-dnl gimphwrapbox
-GIMPHWRAPBOX_MODULES="gtk+-2.0"
-GIMPHWRAPBOX_CFLAGS="`$PKG_CONFIG --cflags $GIMPHWRAPBOX_MODULES`"
-AC_SUBST(GIMPHWRAPBOX_CFLAGS)
-
 dnl gsequence
 GSEQUENCE_MODULES="glib-2.0"
 GSEQUENCE_CFLAGS="`$PKG_CONFIG --cflags $GSEQUENCE_MODULES`"
@@ -416,8 +411,6 @@ Makefile
 cut-n-paste-code/Makefile
 cut-n-paste-code/libegg/Makefile
 cut-n-paste-code/gsequence/Makefile
-cut-n-paste-code/widgets/Makefile
-cut-n-paste-code/widgets/gimphwrapbox/Makefile
 data/Makefile
 data/patterns/Makefile
 docs/Makefile
Index: libnautilus-private/nautilus-entry.c
===================================================================
--- libnautilus-private/nautilus-entry.c	(revisjon 12763)
+++ libnautilus-private/nautilus-entry.c	(arbeidskopi)
@@ -29,7 +29,6 @@
 
 #include <string.h>
 #include "nautilus-global-preferences.h"
-#include "nautilus-undo-signal-handlers.h"
 #include <eel/eel-gdk-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
@@ -66,8 +65,6 @@ nautilus_entry_init (NautilusEntry *entr
 	entry->details = g_new0 (NautilusEntryDetails, 1);
 	
 	entry->details->user_edit = TRUE;
-
-	nautilus_undo_set_up_nautilus_entry_for_undo (entry);
 }
 
 GtkWidget *
@@ -246,7 +243,7 @@ nautilus_entry_select_all_at_idle (Nauti
  * This function wraps gtk_entry_set_text.  It sets undo_registered
  * to TRUE and preserves the old value for a later restore.  This is
  * done so the programmatic changes to the entry do not register
- * with the undo manager.
+ * with the undo manager. Do we need this now that undo is gone?
  *  
  * @entry: A NautilusEntry
  * @test: The text to set
Index: libnautilus-private/Makefile.am
===================================================================
--- libnautilus-private/Makefile.am	(revisjon 12763)
+++ libnautilus-private/Makefile.am	(arbeidskopi)
@@ -17,7 +17,6 @@ INCLUDES = 						\
 	$(NULL)
 
 dependency_static_libs = \
-        $(top_builddir)/cut-n-paste-code/widgets/gimphwrapbox/libgtkhwrapbox.la \
 	$(top_builddir)/cut-n-paste-code/libegg/libegg.la \
 	$(top_builddir)/libbackground/libbackground.la \
         $(NULL)
@@ -189,15 +188,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-users-groups-cache.c \
 	nautilus-users-groups-cache.h \
 	nautilus-vfs-directory.c \
Index: cut-n-paste-code/Makefile.am
===================================================================
--- cut-n-paste-code/Makefile.am	(revisjon 12763)
+++ cut-n-paste-code/Makefile.am	(arbeidskopi)
@@ -1,4 +1,4 @@
-SUBDIRS = widgets libegg
+SUBDIRS = libegg
 
 if !HAVE_GLIB_2_14
 SUBDIRS += gsequence
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]