[empathy] EmpathyChat: pass platform-data when activating
- From: Marco Trevisan <marcotrevi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] EmpathyChat: pass platform-data when activating
- Date: Fri, 5 Apr 2013 12:12:41 +0000 (UTC)
commit 0f64b475daf19bd7167fe22354880c604152ec8b
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date: Thu Apr 4 22:40:12 2013 +0200
EmpathyChat: pass platform-data when activating
This can be done by not initializing gtk before that the application will do it.
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 e6e8b1b..1c4c57d 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");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]