gnome-session r4643 - in trunk: . gnome-session

[lucasr svn gnome org]

Author: lucasr
Date: Thu Apr 10 18:52:01 2008
New Revision: 4643
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4643&view=rev

Log:
2008-04-10  Lucas Rocha  <lucasr gnome org>

	* gnome-session/main.c (main), gnome-session/Makefile.am: uncommented
	gettext-related code. Defined locale directory.


Modified:
   trunk/ChangeLog
   trunk/gnome-session/Makefile.am
   trunk/gnome-session/main.c

Modified: trunk/gnome-session/Makefile.am
==============================================================================
--- trunk/gnome-session/Makefile.am	(original)
+++ trunk/gnome-session/Makefile.am	Thu Apr 10 18:52:01 2008
@@ -4,6 +4,7 @@
 	$(GCONF_CFLAGS)				\
 	$(GTK_CFLAGS)				\
 	-I$(top_srcdir)/egg			\
+	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
 	-DDBUS_LAUNCH=\"dbus-launch\"		\
 	-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
 	-DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \

Modified: trunk/gnome-session/main.c
==============================================================================
--- trunk/gnome-session/main.c	(original)
+++ trunk/gnome-session/main.c	Thu Apr 10 18:52:01 2008
@@ -93,11 +93,9 @@
   GError *err = NULL;
   char *display_str;
 
-#if 0
-  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
-#endif
 
   sa.sa_handler = SIG_IGN;
   sa.sa_flags = 0;