Merge branch 'gnome-3-8'

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

diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index c63a5b57bd43f781e24d16b5fa8b3a4caf2dbc3d..abb73ac444d13e5159ec591c52159d816891c966 100644 (file)
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -17,15 +17,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
 #include "empathy-debug-window.h"
+#include "empathy-ui-utils.h"
 
 #define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger"
 
@@ -74,7 +71,7 @@ command_line_cb (GApplication *application,
   optcontext = g_option_context_new (N_("- Empathy Debugger"));
   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 = g_application_command_line_get_arguments (command_line, &argc);
 
   if (!g_option_context_parse (optcontext, &argc, &argv, &error))
@@ -103,6 +100,7 @@ main (int argc,
 
   gtk_init (&argc, &argv);
   empathy_gtk_init ();
+  textdomain (GETTEXT_PACKAGE);
 
   app = gtk_application_new (EMPATHY_DEBUGGER_DBUS_NAME,
       G_APPLICATION_HANDLES_COMMAND_LINE);
@@ -114,7 +112,6 @@ main (int argc,
   /* Make empathy and empathy-debugger appear as the same app in gnome-shell */
   gdk_set_program_class ("Empathy");
   gtk_window_set_default_icon_name ("empathy");
-  textdomain (GETTEXT_PACKAGE);
 
   retval = g_application_run (G_APPLICATION (app), argc, argv);