rpms/gtk2/devel gtk+-2.14.4-fallback-file-icon.patch, NONE, 1.1 gtk2.spec, 1.334, 1.335

[Alexander Larsson]

Author: alexl

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

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.14.4-fallback-file-icon.patch 
Log Message:
* Fri Oct 24 2008 Alexander Larsson <alexl at redhat.com> - 2.14.4-3
- Manually check for fallback file icon since we're not
  always returning that from gio anymore (from upstream)


gtk+-2.14.4-fallback-file-icon.patch:

--- NEW FILE gtk+-2.14.4-fallback-file-icon.patch ---
Index: gtk/gtkfilesystem.c
===================================================================
--- gtk/gtkfilesystem.c	(revision 21702)
+++ gtk/gtkfilesystem.c	(revision 21703)
@@ -1738,6 +1738,14 @@ _gtk_file_info_render_icon (GFileInfo *i
 
       if (icon)
 	pixbuf = get_pixbuf_from_gicon (icon, widget, icon_size, NULL);
+
+      if (!pixbuf)
+	{
+	   /* Use general fallback for all files without icon */
+	  icon = g_themed_icon_new ("text-x-generic");
+	  pixbuf = get_pixbuf_from_gicon (icon, widget, icon_size, NULL);
+	  g_object_unref (icon);
+	}
     }
 
   return pixbuf;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- gtk2.spec	22 Oct 2008 14:58:22 -0000	1.334
+++ gtk2.spec	24 Oct 2008 09:30:51 -0000	1.335
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -32,6 +32,8 @@
 Patch2: workaround.patch
 # from upstream
 Patch3: randr-fix.patch
+# from upstream
+Patch4: gtk+-2.14.4-fallback-file-icon.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -119,6 +121,7 @@
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .randr-fix
+%patch4 -p0 -b .fallback-file-icon
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -300,6 +303,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Fri Oct 24 2008 Alexander Larsson <alexl at redhat.com> - 2.14.4-3
+- Manually check for fallback file icon since we're not
+  always returning that from gio anymore (from upstream)
+
 * Wed Oct 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.4-2
 - Don't emit size-changed signals if the screen size doesn't change