[maemo-commits] [maemo-commits] r12347 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-06-19 11:06:43 +0300 (Tue, 19 Jun 2007)
New Revision: 12347

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/configure.ac
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
Log:
patch from Carlos Garnacho


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-06-19 07:54:07 UTC (rev 12346)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-06-19 08:06:43 UTC (rev 12347)
@@ -1,3 +1,11 @@
+2007-06-19  Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+
+	Patch from Carlos Garnacho:
+	* configure.ac: Add definition of GETTEXT_PACKAGE.
+
+	* hildon-fm/hildon-file-selection.c (thumbnail_data_func): Use
+	GETTEXT_PACKAGE as the localisation domain. Fixes: NB#60759
+
 2007-06-15  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/Makefile.am (hildonincludeinst_DATA): Add

Modified: projects/haf/trunk/hildon-fm/configure.ac
===================================================================
--- projects/haf/trunk/hildon-fm/configure.ac	2007-06-19 07:54:07 UTC (rev 12346)
+++ projects/haf/trunk/hildon-fm/configure.ac	2007-06-19 08:06:43 UTC (rev 12347)
@@ -96,6 +96,9 @@
 fi
 AC_SUBST(REBUILD)
 
+GETTEXT_PACKAGE="hildon-fm"
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package name])
+
 AC_CONFIG_FILES([Makefile
 		 hildon-fm/Makefile
  	         doc/Makefile

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-06-19 07:54:07 UTC (rev 12346)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-06-19 08:06:43 UTC (rev 12347)
@@ -1,3 +1,9 @@
+libhildonfm (1:1.9.30~unreleased) unstable; urgency=low
+
+  * Fix some logical strings. Fixes: NB#60759
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 19 Jun 2007 09:56:21 +0300
+
 libhildonfm (1:1.9.29) unstable; urgency=low
 
   * Provide "Storage Details Dialog".

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-06-19 07:54:07 UTC (rev 12346)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-06-19 08:06:43 UTC (rev 12347)
@@ -1943,7 +1943,7 @@
         gint n = gtk_tree_model_iter_n_children(model, iter);
 
         g_snprintf(buffer2, sizeof(buffer2),
-                   dngettext(PACKAGE,
+                   dngettext(GETTEXT_PACKAGE,
                              "sfil_li_folder_contents_item",
                              "sfil_li_folder_contents_items", n),  n );
         line2 = buffer2;