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

fix a crash in the appearance capplet

Browse Source
This commit is contained in:
Matthias Clasen 2009-09-28 16:47:25 +00:00
parent fdc8b24835
commit 04589565f7
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2.spec
View File

@ -17,7 +17,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: 4%{?dist} Release: 5%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2 Source: http://download.gnome.org/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
@ -34,6 +34,8 @@ Patch1: gtk2-printing-smb-auth.patch
Patch2: gtk2-printing-nonblocking-printer-list.patch Patch2: gtk2-printing-nonblocking-printer-list.patch
# from upstream # from upstream
Patch3: fix-anchors.patch Patch3: fix-anchors.patch
# from upstream
Patch4: iconview-crash.patch
BuildRequires: atk-devel >= %{atk_version} BuildRequires: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
@ -148,6 +150,7 @@ This package contains developer documentation for the GTK+ widget toolkit.
%patch1 -p1 -b .printing-smb-auth %patch1 -p1 -b .printing-smb-auth
%patch2 -p1 -b .printing-nonblocking-printer-list %patch2 -p1 -b .printing-nonblocking-printer-list
%patch3 -p1 -b .fix-anchors %patch3 -p1 -b .fix-anchors
%patch4 -p1 -b .iconview-crash
# make sure that gtkmarshalers.{c, h} get regenerated during the build # make sure that gtkmarshalers.{c, h} get regenerated during the build
# - caused by print_authentication.patch # - caused by print_authentication.patch
@ -389,6 +392,9 @@ fi
%changelog %changelog
* Mon Sep 28 2009 Matthias Clasen <mclasen@redhat.com> - 2.18.0-3
- Fix a crash in the appearance capplet
* Sun Sep 27 2009 Matthias Clasen <mclasen@redhat.com> - 2.18.0-2 * Sun Sep 27 2009 Matthias Clasen <mclasen@redhat.com> - 2.18.0-2
- Fix anchor handling in text views (#525910) - Fix anchor handling in text views (#525910)

23
iconview-crash.patch Normal file
View File

@ -0,0 +1,23 @@
diff -up gtk+-2.18.0/gtk/gtkiconview.c.iconview-crash gtk+-2.18.0/gtk/gtkiconview.c
--- gtk+-2.18.0/gtk/gtkiconview.c.iconview-crash 2009-09-28 12:38:46.956098207 -0400
+++ gtk+-2.18.0/gtk/gtkiconview.c 2009-09-28 12:40:03.636858596 -0400
@@ -3469,6 +3469,9 @@ gtk_icon_view_get_item_at_coords (GtkIco
GList *items, *l;
GdkRectangle box;
+ if (cell_at_pos)
+ *cell_at_pos = NULL;
+
for (items = icon_view->priv->items; items; items = items->next)
{
GtkIconViewItem *item = items->data;
@@ -3503,9 +3506,6 @@ gtk_icon_view_get_item_at_coords (GtkIco
}
}
- if (cell_at_pos)
- *cell_at_pos = NULL;
-
if (only_in_cell)
return NULL;
}