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

Fix a possible crash when dragging notebook tabs.

Browse Source
This commit is contained in:
Matthias Clasen 2008-04-10 01:53:33 +00:00
parent 1ea2edf9c6
commit c23e889c13
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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: 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.12/gtk+-%{version}.tar.bz2 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@ -45,9 +45,13 @@ Patch6: implicit-g_fopen.patch
# fixed upstream # fixed upstream
Patch7: filechooser-iconsize.patch Patch7: filechooser-iconsize.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=521032 # http://bugzilla.gnome.org/show_bug.cgi?id=521032
Patch8: filechooser-auth.patch Patch8: filechooser-auth.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=467698
Patch9: tab-drag-crash.patch
BuildRequires: atk-devel >= %{atk_version} BuildRequires: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: glib2-devel >= %{glib2_version}
@ -131,6 +135,7 @@ docs for the GTK+ widget toolkit.
%patch6 -p1 -b .implicit-g_fopen %patch6 -p1 -b .implicit-g_fopen
%patch7 -p1 -b .filechooser-iconsize %patch7 -p1 -b .filechooser-iconsize
%patch8 -p1 -b .filechooser-auth %patch8 -p1 -b .filechooser-auth
%patch9 -p1 -b .tab-drag-crash
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 .
@ -313,6 +318,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-2.0 %{_datadir}/gtk-2.0
%changelog %changelog
* Wed Apr 9 2008 Matthias Clasen <mclasen@redhat.com> - 2.12.9-5
- Fix a possible crash when dragging notebook tabs
* Wed Apr 9 2008 Matthias Clasen <mclasen@redhat.com> - 2.12.9-4 * Wed Apr 9 2008 Matthias Clasen <mclasen@redhat.com> - 2.12.9-4
- Make sure we use the right icon size for all icons in the - Make sure we use the right icon size for all icons in the
file chooser (Fix by Tomas Bzatek) file chooser (Fix by Tomas Bzatek)

11
tab-drag-crash.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up gtk+-2.12.9/gtk/gtknotebook.c.tab-drag-crash gtk+-2.12.9/gtk/gtknotebook.c
--- gtk+-2.12.9/gtk/gtknotebook.c.tab-drag-crash 2008-04-09 21:50:07.000000000 -0400
+++ gtk+-2.12.9/gtk/gtknotebook.c 2008-04-09 21:50:12.000000000 -0400
@@ -2729,7 +2729,6 @@ hide_drag_window (GtkNotebook *no
else
gtk_widget_unparent (page->tab_label);
- gtk_widget_set_parent_window (page->tab_label, widget->window);
gtk_widget_set_parent (page->tab_label, widget);
g_object_unref (page->tab_label);
}