From 0bdc32e6c8475228c1510c428cbed1a3ee13c4e6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 15 Sep 2009 15:34:14 -0500
Subject: Adding in gettext init stuff.

---
 src/session-service.c | 7 +++++++
 src/status-service.c  | 7 +++++++
 src/users-service.c   | 8 ++++++++
 3 files changed, 22 insertions(+)

diff --git a/src/session-service.c b/src/session-service.c
index 59a3a97..4db0a6e 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -21,6 +21,7 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 
 #include <glib/gi18n.h>
 
@@ -282,6 +283,12 @@ main (int argc, char ** argv)
 {
     g_type_init();
 
+	/* Setting up i18n and gettext.  Apparently, we need
+	   all of these. */
+	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
+
     DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
     DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
     GError * error = NULL;
diff --git a/src/status-service.c b/src/status-service.c
index d8f60d4..b4a2e09 100644
--- a/src/status-service.c
+++ b/src/status-service.c
@@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
 
 #include <sys/types.h>
 #include <pwd.h>
@@ -257,6 +258,12 @@ main (int argc, char ** argv)
 {
     g_type_init();
 
+	/* Setting up i18n and gettext.  Apparently, we need
+	   all of these. */
+	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
+
     DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
     DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
     GError * error = NULL;
diff --git a/src/users-service.c b/src/users-service.c
index 5db832b..d50a277 100644
--- a/src/users-service.c
+++ b/src/users-service.c
@@ -20,6 +20,8 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
+
 #include <unistd.h>
 
 #include <glib/gi18n.h>
@@ -133,6 +135,12 @@ main (int argc, char ** argv)
 {
     g_type_init();
 
+	/* Setting up i18n and gettext.  Apparently, we need
+	   all of these. */
+	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
+
     session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
     bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
     GError * error = NULL;
-- 
cgit v1.2.3


From 234416607f907adb2348ebe369c7e04b6b887a8c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 15 Sep 2009 15:45:56 -0500
Subject: Adding locale stuff in here too!  Fun.

---
 src/gtk-dialog/gtk-logout-helper.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c
index e6a9ef8..0c03e86 100644
--- a/src/gtk-dialog/gtk-logout-helper.c
+++ b/src/gtk-dialog/gtk-logout-helper.c
@@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
+#include <config.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <dbus/dbus-glib.h>
@@ -121,6 +121,12 @@ main (int argc, char * argv[])
 {
 	gtk_init(&argc, &argv);
 
+	/* Setting up i18n and gettext.  Apparently, we need
+	   all of these. */
+	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
+
 	GError * error = NULL;
 	GOptionContext * context = g_option_context_new(" - logout of the current session");
 	g_option_context_add_main_entries(context, options, "gtk-logout-helper");
-- 
cgit v1.2.3

-- 
cgit v1.2.3