nautilus r15143 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Thu Mar 19 17:39:50 2009
New Revision: 15143
URL: http://svn.gnome.org/viewvc/nautilus?rev=15143&view=rev

Log:
2009-03-19  Cosimo Cecchi  <cosimoc gnome org>

	* src/nautilus-window-menus.c:
	(nautilus_window_remove_trash_monitor_callback):
	* src/nautilus-window-private.h:
	* src/nautilus-window.c: (nautilus_window_finalize):
	Remember to disconnect the signal handler to the trash monitor
	when finalizing the window, as we don't own that object.


Modified:
   trunk/ChangeLog
   trunk/src/nautilus-window-menus.c
   trunk/src/nautilus-window-private.h
   trunk/src/nautilus-window.c

Modified: trunk/src/nautilus-window-menus.c
==============================================================================
--- trunk/src/nautilus-window-menus.c	(original)
+++ trunk/src/nautilus-window-menus.c	Thu Mar 19 17:39:50 2009
@@ -1058,4 +1058,14 @@
 	}
 }
 
+void
+nautilus_window_remove_trash_monitor_callback (NautilusWindow *window)
+{
+	NautilusTrashMonitor *monitor;
+
+	monitor = nautilus_trash_monitor_get ();
+
+	g_signal_handlers_disconnect_by_func (monitor,
+					      trash_state_changed_cb, window);
+}
 

Modified: trunk/src/nautilus-window-private.h
==============================================================================
--- trunk/src/nautilus-window-private.h	(original)
+++ trunk/src/nautilus-window-private.h	Thu Mar 19 17:39:50 2009
@@ -165,6 +165,7 @@
 void               nautilus_window_load_view_as_menus                    (NautilusWindow    *window);
 void               nautilus_window_load_extension_menus                  (NautilusWindow    *window);
 void               nautilus_window_initialize_menus                      (NautilusWindow    *window);
+void               nautilus_window_remove_trash_monitor_callback         (NautilusWindow    *window);
 void               nautilus_menus_append_bookmark_to_menu                (NautilusWindow    *window, 
                                                                           NautilusBookmark  *bookmark, 
                                                                           const char        *parent_path,

Modified: trunk/src/nautilus-window.c
==============================================================================
--- trunk/src/nautilus-window.c	(original)
+++ trunk/src/nautilus-window.c	Thu Mar 19 17:39:50 2009
@@ -620,6 +620,7 @@
 	window = NAUTILUS_WINDOW (object);
 
 	nautilus_window_remove_bookmarks_menu_callback (window);
+	nautilus_window_remove_trash_monitor_callback (window);
 
 	free_stored_viewers (window);