Merge branch 'gnome-3-4'

[empathy.git] / src / empathy-accounts.c

diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index efb98e9b309456d7f9c81f85dcbd0d355b574776..027d99918ef71cec2496ff7d1c8e1e2c5f9cf50c 100644 (file)
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -199,6 +199,7 @@ local_cmdline (GApplication *app,
   optcontext = g_option_context_new (N_("- Empathy Accounts"));
   g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
   g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
+  g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
 
   argv = *arguments;
   for (i = 0; argv[i] != NULL; i++)
@@ -226,7 +227,6 @@ main (int argc, char *argv[])
   GObjectClass *app_class;
   gint retval;
 
-  g_thread_init (NULL);
   g_type_init ();
 
 #ifdef HAVE_CHEESE
@@ -244,7 +244,6 @@ main (int argc, char *argv[])
   /* Make empathy and empathy-accounts appear as the same app in gnome-shell */
   gdk_set_program_class ("Empathy");
   gtk_window_set_default_icon_name ("empathy");
-  textdomain (GETTEXT_PACKAGE);
 
   app = gtk_application_new (EMPATHY_ACCOUNTS_DBUS_NAME,
       G_APPLICATION_HANDLES_COMMAND_LINE);