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

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-07-11 16:31:15 +0300 (Wed, 11 Jul 2007)
New Revision: 12717

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-storage-dialog.c
Log:
Fix NB#63101.

Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-07-11 12:07:41 UTC (rev 12716)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-07-11 13:31:15 UTC (rev 12717)
@@ -1,3 +1,9 @@
+2007-07-11  Richard Hult  <richard at imendio.com>
+
+	* hildon-fm/hildon-file-system-storage-dialog.c:
+	(file_system_storage_dialog_update): Fix NB#63101, wrong
+	translation of unnames MMC cards.
+
 2007-07-05  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-system-storage-dialog.c

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-07-11 12:07:41 UTC (rev 12716)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-07-11 13:31:15 UTC (rev 12717)
@@ -3,6 +3,8 @@
   * Clarify API doc comments about the storage root URIs for the storage
     details dialog, fix a small unlikely leak and only do fast MIME type
     checking.
+  * Fixes NB#63101. mmc-undefined-name in hildon-file-system-storage-dialog
+    for memory card.
 
  -- Richard Hult <richard at imendio.com>  Wed,  4 Jul 2007 11:53:22 +0200
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-storage-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-storage-dialog.c	2007-07-11 12:07:41 UTC (rev 12716)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-storage-dialog.c	2007-07-11 13:31:15 UTC (rev 12717)
@@ -1214,14 +1214,18 @@
 			display_name = gnome_vfs_volume_get_display_name (volume);
 
                         if (display_name) {
-                                if (g_str_has_prefix (display_name, "mmc-undefined-name")) {
-                                        gchar *translated;
-
-                                        translated = g_strdup (_(display_name));
-                                        g_free (display_name);
-
-                                        display_name = translated;
+                                gchar *translated;
+                                
+                                if (strcmp (display_name, "mmc-undefined-name") == 0) {
+                                        translated = g_strdup (_("sfil_li_memorycard_removable"));
                                 }
+                                else if (strcmp (display_name, "mmc-undefined-name-internal") == 0) {
+                                        translated = g_strdup (_("sfil_li_memorycard_internal"));
+                                } else {
+                                        translated = g_strdup (display_name);
+                                }
+                                g_free (display_name);
+                                display_name = translated;
                         }
 
                         gtk_label_set_text (GTK_LABEL (priv->label_name),