diff -up gnome-phone-manager-0.66/libgsm/glibgsmtest.c.no-g-thread-init gnome-phone-manager-0.66/libgsm/glibgsmtest.c
--- gnome-phone-manager-0.66/libgsm/glibgsmtest.c.no-g-thread-init	2011-11-28 11:48:22.334360025 +0100
+++ gnome-phone-manager-0.66/libgsm/glibgsmtest.c	2011-11-28 11:49:17.081032493 +0100
@@ -133,12 +133,11 @@ main (int argc, char **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
+	g_type_init ();
+
 	context = g_option_context_new ("Manage mobile phone");
 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
 
-	g_thread_init (NULL);
-	g_type_init ();
-
 	if (g_option_context_parse (context, &argc, &argv, &err) == FALSE) {
 		g_print ("couldn't parse command-line options: %s\n", err->message);
 		g_error_free (err);
diff -up gnome-phone-manager-0.66/src/main.c.no-g-thread-init gnome-phone-manager-0.66/src/main.c
--- gnome-phone-manager-0.66/src/main.c.no-g-thread-init	2011-11-28 11:48:33.334495138 +0100
+++ gnome-phone-manager-0.66/src/main.c	2011-11-28 11:49:40.296317640 +0100
@@ -49,7 +49,7 @@ main (int argc, char **argv)
 	GOptionContext *context;
 	GError *error = NULL;
 
-	g_thread_init (NULL);
+	g_type_init ();
 
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
diff -up gnome-phone-manager-0.66/src/test-entry.c.no-g-thread-init gnome-phone-manager-0.66/src/test-entry.c
--- gnome-phone-manager-0.66/src/test-entry.c.no-g-thread-init	2011-11-28 11:48:46.118652168 +0100
+++ gnome-phone-manager-0.66/src/test-entry.c	2011-11-28 11:49:57.712531557 +0100
@@ -45,7 +45,7 @@ int main (int argc, char **argv)
 {
 	GtkWidget *window, *entry;
 
-	g_thread_init (NULL);
+	g_type_init ();
 
 	gtk_init (&argc, &argv);
 
diff -up gnome-phone-manager-0.66/telepathy/main.c.no-g-thread-init gnome-phone-manager-0.66/telepathy/main.c
--- gnome-phone-manager-0.66/telepathy/main.c.no-g-thread-init	2011-11-28 11:48:08.579191022 +0100
+++ gnome-phone-manager-0.66/telepathy/main.c	2011-11-28 11:50:22.000830141 +0100
@@ -58,8 +58,8 @@ main(int argc,
 	int ret = 0;
 	GOptionContext *context;
 
+	g_type_init ();
 	g_set_prgname("telepathy-phoney");
-	g_thread_init (NULL);
 
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);