From 03ae69cf40d674a5da080f97a1141dd2aa3bd900 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 11 Jun 2012 11:26:58 -0400
Subject: [PATCH] * #12303: call gtk_init earlier
---
gnome/src/main.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/gnome/src/main.c b/gnome/src/main.c
index d9c93586a6..d5e739b003 100644
--- a/gnome/src/main.c
+++ b/gnome/src/main.c
@@ -57,15 +57,6 @@ main(int argc, char *argv[])
signal(SIGHUP, signal_handler);
signal(SIGTERM, signal_handler);
- GError *error = NULL;
- // Handle logging
- int i;
-
- // Check arguments if debug mode is activated
- for (i = 0; i < argc; i++)
- if (g_strcmp0(argv[i], "--debug") == 0)
- set_log_level(LOG_DEBUG);
-
#if !GTK_CHECK_VERSION(2,32,0)
g_thread_init(NULL);
gdk_threads_init();
@@ -75,6 +66,13 @@ main(int argc, char *argv[])
// Start GTK application
gtk_init(&argc, &argv);
+ // Handle logging
+
+ // Check arguments if debug mode is activated
+ for (int i = 0; i < argc; i++)
+ if (g_strcmp0(argv[i], "--debug") == 0)
+ set_log_level(LOG_DEBUG);
+
g_print("%s %s\n", PACKAGE, VERSION);
g_print("\nCopyright (c) 2005 - 2012 Savoir-faire Linux Inc.\n\n");
g_print("This is free software. You may redistribute copies of it under the terms of\n" \
@@ -93,9 +91,10 @@ main(int argc, char *argv[])
srand(time(NULL));
// Internationalization
- bindtextdomain("sflphone-client-gnome", LOCALEDIR);
- textdomain("sflphone-client-gnome");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
+ GError *error = NULL;
if (!sflphone_init(&error)) {
ERROR("%s", error->message);
GtkWidget *dialog = gtk_message_dialog_new(
--
GitLab