krb5-auth-dialog r77 - in trunk: . src

[walters svn gnome org]

Author: walters
Date: Mon Jun  9 19:58:45 2008
New Revision: 77
URL: http://svn.gnome.org/viewvc/krb5-auth-dialog?rev=77&view=rev

Log:
2008-06-09  Colin Walters  <walters verbum org>

	Bug 534736: make i18n work

	* src/krb5-auth-dialog.c: Set up i18n correctly.
	* src/Makefile.am: Pass in LOCALEDIR.
	Patch from from Guido GÃnther.



Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/krb5-auth-dialog.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Jun  9 19:58:45 2008
@@ -1,5 +1,6 @@
-INCLUDES =				\
-	-DGLADEDIR=\""$(datadir)/krb5-auth-dialog/"\"
+INCLUDES = \
+	-DGLADEDIR=\""$(gladedir)/"\" \
+	-DLOCALE_DIR=\""$(localedir)/"\"
 
 bin_PROGRAMS = krb5-auth-dialog
 man_MANS = krb5-auth-dialog.1

Modified: trunk/src/krb5-auth-dialog.c
==============================================================================
--- trunk/src/krb5-auth-dialog.c	(original)
+++ trunk/src/krb5-auth-dialog.c	Mon Jun  9 19:58:45 2008
@@ -602,9 +602,12 @@
 		g_error_free (error);
 		return 1;
 	}
+	textdomain (PACKAGE);
+	bind_textdomain_codeset (PACKAGE, "UTF-8");
+	bindtextdomain (PACKAGE, LOCALE_DIR);
 
 	/* Connect to the session bus so we get exit-on-disconnect semantics. */
-	session = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	session = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 	if (session == NULL) {
 		g_error ("couldn't connect to session bus: %s", (error) ? error->message : "(null)");
 		exit(1);