rpms/glib2/devel glib-2.18.2-no-generic-icons.patch, NONE, 1.1 glib2.spec, 1.185, 1.186

[Alexander Larsson]

Author: alexl

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9700

Modified Files:
	glib2.spec 
Added Files:
	glib-2.18.2-no-generic-icons.patch 
Log Message:
* Fri Oct 24 2008 Alexander Larsson <alexl at redhat.com> - 2.18.2-2
- Don't return generic fallback icons for files,
  as this means custom mimetypes don't work (from svn)


glib-2.18.2-no-generic-icons.patch:

--- NEW FILE glib-2.18.2-no-generic-icons.patch ---
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);
                     }
                 }
 


Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- glib2.spec	16 Oct 2008 22:06:22 -0000	1.185
+++ glib2.spec	24 Oct 2008 08:41:50 -0000	1.186
@@ -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 @@
 # 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 @@
 %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 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Oct 24 2008 Alexander Larsson <alexl at 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 at redhat.com> - 2.18.2-1
 - Update to 2.18.2