Initialize GObject

Conflicts:

	src/empathy.c

diff --git a/src/empathy.c b/src/empathy.c
index fb4590fd8ee3682f4a5459f5afb0b6394bfb5ad6..4300485c92c69d2429aecf88ae5535f210c8a531 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -716,8 +716,8 @@ main (int argc, char *argv[])
   gtk_clutter_init (&argc, &argv);
 #endif
 
+  g_type_init ();
   tpy_cli_init ();
-
   empathy_init ();
   gtk_init (&argc, &argv);
   empathy_gtk_init ();