Changeset 14670 for trunk/gtk/main.c

Timestamp:

Jan 9, 2016, 6:06:17 PM (6 years ago)

Author:

mikedld

Message:

#6051: transmission-gtk --version shouldn't require display

File:

• trunk/gtk/main.c (modified) (2 diffs)

trunk/gtk/main.c

@@ -644 +644 @@
   g_type_init ();
 #endif
-  gtk_init (&argc, &argv);
   g_set_application_name (_("Transmission"));
-  gtk_window_set_default_icon_name (MY_CONFIG_NAME);
 
   /* parse the command line */
   option_context = g_option_context_new (_("[torrent files or urls]"));
   g_option_context_add_main_entries (option_context, option_entries, GETTEXT_PACKAGE);
+  g_option_context_add_group (option_context, gtk_get_option_group (FALSE));
   g_option_context_set_translation_domain (option_context, GETTEXT_PACKAGE);
   if (!g_option_context_parse (option_context, &argc, &argv, &error))
@@ -667 +666 @@
       return 0;
     }
+
+  gtk_window_set_default_icon_name (MY_CONFIG_NAME);
 
   /* init the unit formatters */