gvfs r1715 - in branches/gnome-2-22: . hal

[awalton svn gnome org]

Author: awalton
Date: Tue Apr  1 14:24:56 2008
New Revision: 1715
URL: http://svn.gnome.org/viewvc/gvfs?rev=1715&view=rev

Log:
	reviewed by: Christian Kellner
	* hal/ghalmount.c (do_update_from_hal):
	Disable the "media-encrypted" icon for Gnome 2.22.



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/hal/ghalmount.c

Modified: branches/gnome-2-22/hal/ghalmount.c
==============================================================================
--- branches/gnome-2-22/hal/ghalmount.c	(original)
+++ branches/gnome-2-22/hal/ghalmount.c	Tue Apr  1 14:24:56 2008
@@ -443,8 +443,13 @@
     icon_name = icon_from_hal;
   else if (is_audio_player)
     icon_name = "multimedia-player";
+#if 0
+  /* This icon hasn't been finalized yet, and causes issues with
+   * the icon theme, so it has been disabled for gnome 2.22.
+   */
   else if (is_crypto || is_crypto_cleartext)
     icon_name = "media-encrypted";
+#endif
   else if (strcmp (drive_type, "disk") == 0)
     {
       if (strcmp (drive_bus, "ide") == 0)