Skip to content
Snippets Groups Projects
Commit 03ae69cf authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #12303: call gtk_init earlier

parent 80d4942b
No related branches found
No related tags found
No related merge requests found
......@@ -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(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment