[PATCH] Change GnomeVFS/EEL shutdown order



Cf. the comment in the attached patch.

-- 
Christian Neumair <chris gnome-de org>
Index: src/nautilus-main.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-main.c,v
retrieving revision 1.159
diff -u -p -r1.159 nautilus-main.c
--- src/nautilus-main.c	15 Aug 2006 20:23:12 -0000	1.159
+++ src/nautilus-main.c	7 Oct 2006 09:43:36 -0000
@@ -372,6 +372,11 @@ main (int argc, char *argv[])
 		}
 	}
 
+	/* This has to be done before gnome_vfs_shutdown, because
+ 	 * it might call nautilus_file_get_uri() which might call
+ 	 * gnome_vfs_uri_append_string()
+ 	 */
+ 	eel_debug_shut_down ();
 
 	gnome_vfs_shutdown ();
 
@@ -381,8 +386,6 @@ main (int argc, char *argv[])
 	if (application != NULL) {
 		bonobo_object_unref (application);
 	}
-
-	eel_debug_shut_down ();
 
 	/* If told to restart, exec() myself again. This is used when
 	 * the program is told to restart with CORBA, for example when


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