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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-06-14 12:37:46 +0300 (Thu, 14 Jun 2007)
New Revision: 12289

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c
Log:
	* hildon-fm/hildon-file-system-voldev.c
	(hildon_file_system_voldev_volumes_changed): Do not try to fixup
	the icon when it is NULL.  Thanks to Carlos Garnacho!


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-06-14 09:06:13 UTC (rev 12288)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-06-14 09:37:46 UTC (rev 12289)
@@ -1,3 +1,9 @@
+2007-06-14  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-system-voldev.c
+	(hildon_file_system_voldev_volumes_changed): Do not try to fixup
+	the icon when it is NULL.  Thanks to Carlos Garnacho!
+
 2007-06-13  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 1.9.29

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-14 09:06:13 UTC (rev 12288)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c	2007-06-14 09:37:46 UTC (rev 12289)
@@ -242,22 +242,25 @@
   /* XXX - GnomeVFS should provide the right icons and display names.
    */
 
-  if (strcmp (location->fixed_icon, "gnome-dev-removable-usb") == 0
-      || strcmp (location->fixed_icon, "gnome-dev-harddisk-usb") == 0)
-    location->fixed_icon = "qgn_list_filesys_removable_storage";
-  else if (strcmp (location->fixed_icon, "gnome-dev-removable") == 0
-	   || strcmp (location->fixed_icon, "gnome-dev-media-sdmmc") == 0)
+  if (location->fixed_icon)
     {
-      gboolean internal = 
-	g_str_has_prefix (location->basepath, "file:///media/mmc2");
-
-      if (internal)
-	location->fixed_icon = "qgn_list_gene_internal_memory_card";
-      else
-      	location->fixed_icon = "qgn_list_gene_removable_memory_card";
-
-      location->fixed_title = beautify_mmc_name (location->fixed_title,
-						 internal);
+      if (strcmp (location->fixed_icon, "gnome-dev-removable-usb") == 0
+	  || strcmp (location->fixed_icon, "gnome-dev-harddisk-usb") == 0)
+	location->fixed_icon = "qgn_list_filesys_removable_storage";
+      else if (strcmp (location->fixed_icon, "gnome-dev-removable") == 0
+	       || strcmp (location->fixed_icon, "gnome-dev-media-sdmmc") == 0)
+	{
+	  gboolean internal = 
+	    g_str_has_prefix (location->basepath, "file:///media/mmc2");
+	  
+	  if (internal)
+	    location->fixed_icon = "qgn_list_gene_internal_memory_card";
+	  else
+	    location->fixed_icon = "qgn_list_gene_removable_memory_card";
+	  
+	  location->fixed_title = beautify_mmc_name (location->fixed_title,
+						     internal);
+	}
     }
 
   g_signal_emit_by_name (location, "changed");