From 4f1767ea8acf2fed52a6d517e6bb095ad16107f8 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@fedoraproject.org>
Date: Fri, 24 Oct 2008 09:30:51 +0000
Subject: [PATCH] - 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 | 19 +++++++++++++++++++
 gtk2.spec                            |  9 ++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 gtk+-2.14.4-fallback-file-icon.patch

diff --git a/gtk+-2.14.4-fallback-file-icon.patch b/gtk+-2.14.4-fallback-file-icon.patch
new file mode 100644
index 0000000..fad2615
--- /dev/null
+++ b/gtk+-2.14.4-fallback-file-icon.patch
@@ -0,0 +1,19 @@
+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;
diff --git a/gtk2.spec b/gtk2.spec
index 7572a40..ed2e9ed 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -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 @@ Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
 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 @@ docs for the GTK+ widget toolkit.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-2.0
 
 %changelog
+* Fri Oct 24 2008 Alexander Larsson <alexl@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@redhat.com> - 2.14.4-2
 - Don't emit size-changed signals if the screen size doesn't change