[GNOME VFS] earlier pthread init patch ...

Michael Meeks <[email protected]> 12 Jul 2002 12:03:13 +0100
Newsgroups gmane.comp.gnome.vfs
Message-ID <[email protected]>
Hi guys,

	I'd like to commit the appended patch, since without it none of the
async tests work at all ;-) - which is pretty bad. And I thought I'd
spend my time tracking down a big silly in the async resource management
instead of doing this.

	HTH,

		Michael.

Index: libgnomevfs/gnome-vfs-init.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-init.c,v
retrieving revision 1.22.2.1
diff -u -p -u -r1.22.2.1 gnome-vfs-init.c
--- libgnomevfs/gnome-vfs-init.c	14 Jun 2002 01:13:55 -0000	1.22.2.1
+++ libgnomevfs/gnome-vfs-init.c	12 Jul 2002 10:55:49 -0000
@@ -85,21 +85,22 @@ gnome_vfs_init (void)
 		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif    
 
-		if (bonobo_activation_orb_get() == NULL) {
+		retval = gnome_vfs_pthread_init (TRUE);
+
+		if (retval && bonobo_activation_orb_get() == NULL) {
 			bonobo_activation_init (0, bogus_argv);
 		}
 
 		gnome_vfs_ssl_init ();
 
-		retval = gnome_vfs_method_init ();
 		if (retval) {
-			retval = gnome_vfs_process_init ();
+			retval = gnome_vfs_method_init ();
 		}
 		if (retval) {
-			retval = gnome_vfs_configuration_init ();
+			retval = gnome_vfs_process_init ();
 		}
 		if (retval) {
-			retval = gnome_vfs_pthread_init (TRUE);
+			retval = gnome_vfs_configuration_init ();
 		}
 		if (retval) {
 			signal (SIGPIPE, SIG_IGN);


-- 
 [email protected]  <><, Pseudo Engineer, itinerant idiot


_______________________________________________
gnome-vfs maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/gnome-vfs