From 542e9037ed8a05a02731bc8826f923c08b7a4f1b Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 18 Jun 2010 18:51:26 +0900
Subject: [PATCH] Simplify intltool support.

---
 po/ja.po       | 14 +++++++-------
 src/eekboard.c | 14 ++++++--------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index f5236b53..82b4c95a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,15 +1,15 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Japanese translations for eekboard package
+# eekboard パッケージに対する英訳.
+# Copyright (C) 2010 Daiki Ueno <ueno@unixuser.org>
+# This file is distributed under the same license as the eekboard package.
+# Daiki Ueno <ueno@unixuser.org>, 2010.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: eekboard 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-18 18:10+0900\n"
-"PO-Revision-Date: 2010-06-18 18:20+0900\n"
+"PO-Revision-Date: 2010-06-18 18:46+0900\n"
 "Last-Translator: Daiki Ueno <ueno@unixuser.org>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
diff --git a/src/eekboard.c b/src/eekboard.c
index 69b06f0a..8cc5ece3 100644
--- a/src/eekboard.c
+++ b/src/eekboard.c
@@ -24,11 +24,11 @@
 #include <clutter-gtk/clutter-gtk.h>
 #endif
 
-#include <fakekey/fakekey.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <libxklavier/xklavier.h>
+#include <fakekey/fakekey.h>
 #if 0
 #include <atk/atk.h>
 #endif
@@ -519,6 +519,11 @@ main (int argc, char *argv[])
     GtkWidget *widget, *vbox, *menubar, *window;
     GtkUIManager *ui_manager;
 
+#ifdef ENABLE_NLS
+    bindtextdomain (GETTEXT_PACKAGE, EEKBOARD_LOCALEDIR);
+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif
+
     env = g_getenv ("EEKBOARD_DISABLE_CLUTTER");
     if (env && g_strcmp0 (env, "1") == 0)
         use_clutter = FALSE;
@@ -536,13 +541,6 @@ main (int argc, char *argv[])
         exit (1);
     }
 
-#ifdef ENABLE_NLS
-    bindtextdomain (GETTEXT_PACKAGE, EEKBOARD_LOCALEDIR);
-    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-
-    gtk_set_locale ();
-#endif
-
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     gtk_widget_set_can_focus (window, FALSE);
     g_object_set (G_OBJECT(window), "accept_focus", FALSE, NULL);