nautilus r13607 - in trunk: . src

[alexl svn gnome org]

Author: alexl
Date: Tue Jan 15 14:45:09 2008
New Revision: 13607
URL: http://svn.gnome.org/viewvc/nautilus?rev=13607&view=rev

Log:
2008-01-15  Alexander Larsson  <alexl redhat com>

        * src/nautilus-file-management-properties.c:
        (nautilus_file_management_properties_dialog_response_cb):
	Don't crash when exiting separate properties app. (#505687)
	
        * src/nautilus-window.c:
        (nautilus_window_update_icon):
	Unref pixbuf inside != NULL block.




Modified:
   trunk/ChangeLog
   trunk/src/nautilus-file-management-properties.c
   trunk/src/nautilus-window.c

Modified: trunk/src/nautilus-file-management-properties.c
==============================================================================
--- trunk/src/nautilus-file-management-properties.c	(original)
+++ trunk/src/nautilus-file-management-properties.c	Tue Jan 15 14:45:09 2008
@@ -250,8 +250,6 @@
 		eel_gconf_monitor_remove ("/apps/nautilus/list_view");
 		eel_gconf_monitor_remove ("/apps/nautilus/preferences");
 		eel_gconf_monitor_remove ("/desktop/gnome/file_views");
-
-		g_object_unref (xml_dialog);
 	}
 }
 

Modified: trunk/src/nautilus-window.c
==============================================================================
--- trunk/src/nautilus-window.c	(original)
+++ trunk/src/nautilus-window.c	Tue Jan 15 14:45:09 2008
@@ -1236,8 +1236,8 @@
 			
 			if (pixbuf) {
 				gtk_window_set_icon (GTK_WINDOW (window), pixbuf);
+				g_object_unref (pixbuf);
 			} 
-			g_object_unref (pixbuf);
 		}
 		
 		g_object_unref (info);