Import from trunk:

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)


svn path=/branches/gnome-2-24/; revision=2075

4 files changed, 11 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index ba726de5..4dce7d48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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)
+
 2008-10-20  Alexander Larsson  <alexl@redhat.com>
 
 	* configure.ac:
diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index 3527ebe7..4ba1337f 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -1804,11 +1804,7 @@ parse_attributes (GVfsBackendSftp *backend,
           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");
diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c
index 63961b14..2c5338cf 100644
--- a/daemon/gvfsbackendsmb.c
+++ b/daemon/gvfsbackendsmb.c
@@ -1381,13 +1381,8 @@ set_info_from_stat (GVfsBackendSmb *backend,
       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)
diff --git a/daemon/gvfsdaemonutils.c b/daemon/gvfsdaemonutils.c
index 93f78262..43243ec7 100644
--- a/daemon/gvfsdaemonutils.c
+++ b/daemon/gvfsdaemonutils.c
@@ -276,8 +276,6 @@ gvfs_file_info_populate_content_types (GFileInfo  *info,
   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);