gvfs r2075 - in branches/gnome-2-24: . daemon

[alexl svn gnome org]

Author: alexl
Date: Thu Oct 23 09:32:45 2008
New Revision: 2075
URL: http://svn.gnome.org/viewvc/gvfs?rev=2075&view=rev

Log:
2008-10-23  Alexander Larsson  <alexl redhat com>

	Import from trunk:
	
        * daemon/gvfsbackendsftp.c:
        * daemon/gvfsbackendsmb.c:
        * daemon/gvfsdaemonutils.c:
	Don't return fallback icons, since that gives problems
	with custom mime icons (#528320)



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/daemon/gvfsbackendsftp.c
   branches/gnome-2-24/daemon/gvfsbackendsmb.c
   branches/gnome-2-24/daemon/gvfsdaemonutils.c

Modified: branches/gnome-2-24/daemon/gvfsbackendsftp.c
==============================================================================
--- branches/gnome-2-24/daemon/gvfsbackendsftp.c	(original)
+++ branches/gnome-2-24/daemon/gvfsbackendsftp.c	Thu Oct 23 09:32:45 2008
@@ -1804,11 +1804,7 @@
           if (S_ISDIR(mode))
             icon = g_themed_icon_new ("folder");
           else if (mimetype)
-            {
               icon = g_content_type_get_icon (mimetype);
-              if (G_IS_THEMED_ICON (icon))
-                g_themed_icon_append_name (G_THEMED_ICON (icon), "text-x-generic");
-            }
 
           if (icon == NULL)
             icon = g_themed_icon_new ("text-x-generic");

Modified: branches/gnome-2-24/daemon/gvfsbackendsmb.c
==============================================================================
--- branches/gnome-2-24/daemon/gvfsbackendsmb.c	(original)
+++ branches/gnome-2-24/daemon/gvfsbackendsmb.c	Thu Oct 23 09:32:45 2008
@@ -1381,13 +1381,8 @@
       else
 	{
 	  content_type = g_content_type_guess (basename, NULL, 0, NULL);
-	  
 	  if (content_type)
-	    {
-              icon = g_content_type_get_icon (content_type);
-              if (G_IS_THEMED_ICON (icon))
-                g_themed_icon_append_name (G_THEMED_ICON (icon), "text-x-generic");
-	    }
+	    icon = g_content_type_get_icon (content_type);
 	}
       
       if (content_type)

Modified: branches/gnome-2-24/daemon/gvfsdaemonutils.c
==============================================================================
--- branches/gnome-2-24/daemon/gvfsdaemonutils.c	(original)
+++ branches/gnome-2-24/daemon/gvfsdaemonutils.c	Thu Oct 23 09:32:45 2008
@@ -276,8 +276,6 @@
   else
     {
       icon = g_content_type_get_icon (mimetype);
-      if (G_IS_THEMED_ICON (icon))
-	g_themed_icon_append_name (G_THEMED_ICON (icon), "text-x-generic");
     }
   
   g_file_info_set_icon (info, icon);