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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-06-19 17:41:14 +0300 (Tue, 19 Jun 2007)
New Revision: 12390

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c
Log:
fixed icons and localised names for drives


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-06-19 14:00:10 UTC (rev 12389)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-06-19 14:41:14 UTC (rev 12390)
@@ -1,5 +1,15 @@
 2007-06-19  Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 
+	Released 1.9.31
+
+	* hildon-fm/hildon-file-system-voldev.c
+	(hildon_file_system_voldev_volumes_change): Set voldev->volume
+	and voldev->drive to NULL if they are garbage (following code relies
+	on this). Added strcmp() for handling icons and localised names
+	for drives correctly.
+
+	Released 1.9.30
+
 	Patch from Carlos Garnacho:
 	* configure.ac: Add definition of GETTEXT_PACKAGE.
 

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-06-19 14:00:10 UTC (rev 12389)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-06-19 14:41:14 UTC (rev 12390)
@@ -1,3 +1,9 @@
+libhildonfm (1:1.9.31~unreleased) unstable; urgency=low
+
+  * Fix icons and localised names for drives.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 19 Jun 2007 17:36:22 +0300
+
 libhildonfm (1:1.9.30) unstable; urgency=low
 
   * Fix some logical strings. Fixes: NB#60759

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c	2007-06-19 14:00:10 UTC (rev 12389)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c	2007-06-19 14:41:14 UTC (rev 12390)
@@ -218,9 +218,15 @@
   HildonFileSystemVoldev *voldev = HILDON_FILE_SYSTEM_VOLDEV (location);
 
   if (voldev->volume)
-    gnome_vfs_volume_unref (voldev->volume);
+    {
+      gnome_vfs_volume_unref (voldev->volume);
+      voldev->volume = NULL;
+    }
   if (voldev->drive)
-    gnome_vfs_drive_unref (voldev->drive);
+    {
+      gnome_vfs_drive_unref (voldev->drive);
+      voldev->drive = NULL;
+    }
 
   if (g_str_has_prefix (location->basepath, "drive://"))
     voldev->drive = find_drive (location->basepath + 8);
@@ -253,6 +259,12 @@
 	  gboolean internal = 
 	    g_str_has_prefix (location->basepath, "file:///media/mmc2");
 	  
+	  /* the following strcmp() is for drives, so that we don't need
+	   * knowledge about device naming */
+	  if (strcmp(location->fixed_title,
+		     "mmc-undefined-name-internal") == 0)
+	    internal = TRUE;
+
 	  if (internal)
 	    location->fixed_icon = "qgn_list_gene_internal_memory_card";
 	  else