From 6e8ec0de66805208265b2937844b25e3f612b9b1 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@fedoraproject.org>
Date: Oct 24 2008 08:41:50 +0000
Subject: - Don't return generic fallback icons for files, as this means custom

    mimetypes don't work (from svn)

---

diff --git a/glib-2.18.2-no-generic-icons.patch b/glib-2.18.2-no-generic-icons.patch
new file mode 100644
index 0000000..9308297
--- /dev/null
+++ b/glib-2.18.2-no-generic-icons.patch
@@ -0,0 +1,19 @@
+Index: gio/glocalfileinfo.c
+===================================================================
+--- gio/glocalfileinfo.c	(revision 7620)
++++ gio/glocalfileinfo.c	(revision 7621)
+@@ -1577,12 +1577,8 @@ _g_local_file_info_get (const char      
+ 
+                       if (S_ISDIR (statbuf.st_mode)) 
+                         type_icon = "folder";
+-                      else if (statbuf.st_mode & S_IXUSR)
+-                        type_icon = "application-x-executable";
+-                      else
+-                        type_icon = "text-x-generic";
+-
+-                      g_themed_icon_append_name (G_THEMED_ICON (icon), type_icon);
++                      if (type_icon)
++                        g_themed_icon_append_name (G_THEMED_ICON (icon), type_icon);
+                     }
+                 }
+ 
diff --git a/glib2.spec b/glib2.spec
index 0ac4a46..ed0587b 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.18.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -22,6 +22,8 @@ BuildRequires: glibc-devel
 # https://bugzilla.redhat.com/show_bug.cgi?id=442835
 # http://bugzilla.gnome.org/show_bug.cgi?id=528670
 Patch2: gio-2.18-always-pass-fuse-file-uri.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=528320 (from svn)
+Patch3: glib-2.18.2-no-generic-icons.patch
 
 # this patch requires autoreconf
 BuildRequires: autoconf automake libtool gettext-devel gtk-doc
@@ -58,6 +60,7 @@ of version 2 of the GLib library.
 %prep
 %setup -q -n glib-%{version}
 %patch2 -p1 -b .always-pass-fuse-file-uri
+%patch3 -p0 -b .no-generic-icons
 
 autoreconf
 
@@ -134,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Oct 24 2008 Alexander Larsson <alexl@redhat.com> - 2.18.2-2
+- Don't return generic fallback icons for files,
+  as this means custom mimetypes don't work (from svn)
+
 * Thu Oct 16 2008 Matthias Clasen <mclasen@redhat.com> - 2.18.2-1
 - Update to 2.18.2