rpms/gtk2/F-12 zerosize.patch,NONE,1.1 gtk2.spec,1.418,1.419

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gtk2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12102

Modified Files:
	gtk2.spec 
Added Files:
	zerosize.patch 
Log Message:
try to help catch a nm-applet problem


zerosize.patch:
 gtkicontheme.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE zerosize.patch ---
diff -up gtk+-2.18.3/gtk/gtkicontheme.c.zerosize gtk+-2.18.3/gtk/gtkicontheme.c
--- gtk+-2.18.3/gtk/gtkicontheme.c.zerosize	2009-10-21 19:13:17.759889007 -0400
+++ gtk+-2.18.3/gtk/gtkicontheme.c	2009-10-21 19:18:53.670897109 -0400
@@ -1402,6 +1402,7 @@ gtk_icon_theme_lookup_icon (GtkIconTheme
 
   g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
   g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (size > 0, NULL);
   g_return_val_if_fail ((flags & GTK_ICON_LOOKUP_NO_SVG) == 0 ||
 			(flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
 
@@ -1477,6 +1478,7 @@ gtk_icon_theme_choose_icon (GtkIconTheme
 {
   g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
   g_return_val_if_fail (icon_names != NULL, NULL);
+  g_return_val_if_fail (size > 0, NULL);
   g_return_val_if_fail ((flags & GTK_ICON_LOOKUP_NO_SVG) == 0 ||
 			(flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
 
@@ -1531,10 +1533,11 @@ gtk_icon_theme_load_icon (GtkIconTheme  
   
   g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
   g_return_val_if_fail (icon_name != NULL, NULL);
+  g_return_val_if_fail (size > 0, NULL);
   g_return_val_if_fail ((flags & GTK_ICON_LOOKUP_NO_SVG) == 0 ||
 			(flags & GTK_ICON_LOOKUP_FORCE_SVG) == 0, NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-  
+
   icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size,
 				          flags | GTK_ICON_LOOKUP_USE_BUILTIN);
   if (!icon_info)
@@ -3308,6 +3311,7 @@ gtk_icon_theme_add_builtin_icon (const g
   gpointer key;
 
   g_return_if_fail (icon_name != NULL);
+  g_return_if_fail (size > 0, NULL);
   g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
   
   if (!icon_theme_builtin_icons)
@@ -3454,6 +3458,7 @@ gtk_icon_theme_lookup_by_gicon (GtkIconT
 
   g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
   g_return_val_if_fail (G_IS_ICON (icon), NULL);
+  g_return_val_if_fail (size > 0, NULL);
 
   if (G_IS_LOADABLE_ICON (icon))
     {


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-12/gtk2.spec,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -p -r1.418 -r1.419
--- gtk2.spec	21 Oct 2009 21:07:22 -0000	1.418
+++ gtk2.spec	21 Oct 2009 23:34:45 -0000	1.419
@@ -17,7 +17,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@@ -34,6 +34,8 @@ Patch2: icon-padding.patch
 Patch3: image-size-alloc.patch
 #
 Patch4: fresh-tooltips.patch
+#
+Patch5: zerosize.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -149,6 +151,7 @@ This package contains developer document
 %patch2 -p1 -b .icon-padding
 %patch3 -p1 -b .image-size-alloc
 %patch4 -p1 -b .fresh-tooltips
+%patch5 -p1 -b .zerosize
 
 %build
 libtoolize --force --copy
@@ -385,6 +388,10 @@ fi
 
 
 %changelog
+* Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-7
+- Try to catch some nm-applet problems by rejecting requests to
+  load icons at size 0
+
 * Wed Oct 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.18.3-6
 - Hack around metacity compositor limitations