gedit r6426 - in trunk: . gedit

[pborelli svn gnome org]

Author: pborelli
Date: Sun Aug 17 19:00:48 2008
New Revision: 6426
URL: http://svn.gnome.org/viewvc/gedit?rev=6426&view=rev

Log:
2008-08-17  Paolo Borelli  <pborelli katamail com>

	* gedit/gedit.c: move g_thread_init at the start, just to be sure.



Modified:
   trunk/ChangeLog
   trunk/gedit/gedit.c

Modified: trunk/gedit/gedit.c
==============================================================================
--- trunk/gedit/gedit.c	(original)
+++ trunk/gedit/gedit.c	Sun Aug 17 19:00:48 2008
@@ -449,6 +449,9 @@
 	gboolean restored = FALSE;
 	GError *error = NULL;
 
+	/* Init glib threads asap */
+	g_thread_init (NULL);
+
 	/* Setup debugging */
 	gedit_debug_init ();
 	gedit_debug_message (DEBUG_APP, "Startup");
@@ -466,13 +469,13 @@
 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
 	g_option_context_add_group (context, gtk_get_option_group (FALSE));
 	g_option_context_add_group (context, egg_sm_client_get_option_group ());
-	
-	g_thread_init (NULL);
+
 	gtk_init (&argc, &argv);
 
 	if (!g_option_context_parse (context, &argc, &argv, &error))
 	{
-	        g_print(_("%s\nRun '%s --help' to see a full list of available command line options.\n"), error->message, argv[0]);
+	        g_print(_("%s\nRun '%s --help' to see a full list of available command line options.\n"),
+			error->message, argv[0]);
 		g_error_free (error);
 		return 1;
 	}
@@ -510,7 +513,9 @@
 		}
 	}
 	else
+	{
 		g_warning ("Cannot create the 'gedit' connection.");
+	}
 
 	gedit_debug_message (DEBUG_APP, "Set icon");
 	
@@ -589,7 +594,6 @@
 	gedit_prefs_manager_app_shutdown ();
 	gedit_metadata_manager_shutdown ();
 
-
 	return 0;
 }