nautilus r14733 - in branches/gnome-2-24: . src

[alexl svn gnome org]

Author: alexl
Date: Fri Oct 17 10:25:29 2008
New Revision: 14733
URL: http://svn.gnome.org/viewvc/nautilus?rev=14733&view=rev

Log:
2008-10-17  Alexander Larsson  <alexl redhat com>

	Merged from trunk:

	* src/nautilus-window-manage-views.c
	(nautilus_window_slot_open_location_full):
	Don't unref NULL, which can happen if !do_load_location




Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/nautilus-window-manage-views.c

Modified: branches/gnome-2-24/src/nautilus-window-manage-views.c
==============================================================================
--- branches/gnome-2-24/src/nautilus-window-manage-views.c	(original)
+++ branches/gnome-2-24/src/nautilus-window-manage-views.c	Fri Oct 17 10:25:29 2008
@@ -618,7 +618,9 @@
         if ((!do_load_location) ||
 	    (target_window == window && target_slot == slot &&
 	     old_location && g_file_equal (old_location, location))) {
-		g_object_unref (old_location);
+		if (old_location) {
+			g_object_unref (old_location);
+		}
                 return;
         }