rpms/gtk2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Manually check for fallback file icon since we're not always returning

Browse Source 
that from gio anymore (from upstream)
This commit is contained in:
Alexander Larsson 2008-10-24 09:30:51 +00:00
parent bee8675f8a
commit 4f1767ea8a
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk+-2.14.4-fallback-file-icon.patch Normal file
View File

@ -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;

9
gtk2.spec
View File

@ -16,7 +16,7 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2 Name: gtk2
Version: %{base_version} Version: %{base_version}
Release: 2%{?dist} Release: 3%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2 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 Patch2: workaround.patch
# from upstream # from upstream
Patch3: randr-fix.patch Patch3: randr-fix.patch
# from upstream
Patch4: gtk+-2.14.4-fallback-file-icon.patch
BuildRequires: atk-devel >= %{atk_version} BuildRequires: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
@ -119,6 +121,7 @@ docs for the GTK+ widget toolkit.
%patch1 -p1 -b .set-invisible-char-to-bullet %patch1 -p1 -b .set-invisible-char-to-bullet
%patch2 -p1 -b .workaround %patch2 -p1 -b .workaround
%patch3 -p1 -b .randr-fix %patch3 -p1 -b .randr-fix
%patch4 -p0 -b .fallback-file-icon
for i in config.guess config.sub ; do for i in config.guess config.sub ; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@ -300,6 +303,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-2.0 %{_datadir}/gtk-2.0
%changelog %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 * 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 - Don't emit size-changed signals if the screen size doesn't change