EmpathyChat: pass platform-data when activating

This can be done by not initializing gtk before that the application will do it.

diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index e6e8b1b3b886a538dc7794e36361dccba268cb14..1c4c57d255965f270543e8b0617a3c7cd574949c 100644 (file)
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -30,6 +30,7 @@
 #include "empathy-presence-manager.h"
 #include "empathy-theme-manager.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
 #include "empathy-debug.h"
@@ -65,6 +66,7 @@ activate_cb (GApplication *application)
     return;
 
   activated = TRUE;
+  empathy_gtk_init ();
 
   if (!use_timer)
     {
@@ -97,7 +99,7 @@ main (int argc,
   gint retval;
 
   optcontext = g_option_context_new (N_("- Empathy Chat Client"));
-  g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
+  g_option_context_add_group (optcontext, gtk_get_option_group (FALSE));
   g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
   g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
 
@@ -112,7 +114,7 @@ main (int argc,
 
   g_option_context_free (optcontext);
 
-  empathy_gtk_init ();
+  empathy_init ();
 
   /* Make empathy and empathy-chat appear as the same app in gnome-shell */
   gdk_set_program_class ("Empathy");