diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2013-04-05 04:40:12 +0800 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2013-04-05 19:38:45 +0800 |
| commit | 0f64b475daf19bd7167fe22354880c604152ec8b (patch) | |
| tree | 8fd45b07ad5e77d2656c596472afb52c80efca47 /src | |
| parent | ed8bfa0abe0762b422be84aa00d77c798a5c95e8 (diff) | |
| download | gsoc2013-empathy-0f64b475daf19bd7167fe22354880c604152ec8b.tar gsoc2013-empathy-0f64b475daf19bd7167fe22354880c604152ec8b.tar.gz gsoc2013-empathy-0f64b475daf19bd7167fe22354880c604152ec8b.tar.bz2 gsoc2013-empathy-0f64b475daf19bd7167fe22354880c604152ec8b.tar.lz gsoc2013-empathy-0f64b475daf19bd7167fe22354880c604152ec8b.tar.xz gsoc2013-empathy-0f64b475daf19bd7167fe22354880c604152ec8b.tar.zst gsoc2013-empathy-0f64b475daf19bd7167fe22354880c604152ec8b.zip | |
EmpathyChat: pass platform-data when activating
This can be done by not initializing gtk before that the application will do it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/empathy-chat.c b/src/empathy-chat.c index e6e8b1b3b..1c4c57d25 100644 --- 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"); |