[maemo-commits] [maemo-commits] r10100 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-02-21 12:52:13 +0200 (Wed, 21 Feb 2007)
New Revision: 10100

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/configure.ac
   projects/haf/trunk/hildon-desktop/src/main.c
Log:
2007-02-21  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/main.c: user GETTEXT_PACKAGE to setup the l10n environment.
	* configure.ac: define a GETTEXT_PACKAGE to bring flexibility on
	defining i18n/l10n settings.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-02-21 09:37:02 UTC (rev 10099)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-02-21 10:52:13 UTC (rev 10100)
@@ -1,3 +1,9 @@
+2007-02-21  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/main.c: user GETTEXT_PACKAGE to setup the l10n environment.
+	* configure.ac: define a GETTEXT_PACKAGE to bring flexibility on
+	defining i18n/l10n settings.
+
 2007-02-21  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildonwm/libhildonwm.pc.in: Fixed dependency on hildon-1

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2007-02-21 09:37:02 UTC (rev 10099)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2007-02-21 10:52:13 UTC (rev 10100)
@@ -66,6 +66,7 @@
 ALL_LINGUAS="en_GB"
 AC_SUBST(ALL_LINGUAS)
 AM_GLIB_GNU_GETTEXT
+AC_DEFINE(GETTEXT_PACKAGE, ["maemo-af-desktop"], [Package name for gettext])
 
 PKG_CHECK_MODULES(OSSOSETTINGS, osso-af-settings >= 0.8.1)
 localedir=`pkg-config osso-af-settings --variable=localedir`

Modified: projects/haf/trunk/hildon-desktop/src/main.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/main.c	2007-02-21 09:37:02 UTC (rev 10099)
+++ projects/haf/trunk/hildon-desktop/src/main.c	2007-02-21 10:52:13 UTC (rev 10100)
@@ -43,11 +43,11 @@
 
   setlocale (LC_ALL, "");
 
-  bindtextdomain (PACKAGE, LOCALEDIR);
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 
-  bind_textdomain_codeset (PACKAGE, "UTF-8");
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-  textdomain (PACKAGE);
+  textdomain (GETTEXT_PACKAGE);
 
   /* Read the maemo-af-desktop gtkrc file */
   gtkrc = g_build_filename (g_get_home_dir (),