rpms/gtk2/devel tab-drag-crash.patch, NONE, 1.1 gtk2.spec, 1.287, 1.288

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14198

Modified Files:
	gtk2.spec 
Added Files:
	tab-drag-crash.patch 
Log Message:
Fix a possible crash when dragging notebook tabs.


tab-drag-crash.patch:

--- NEW FILE tab-drag-crash.patch ---
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);
     }


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- gtk2.spec	9 Apr 2008 17:42:09 -0000	1.287
+++ gtk2.spec	10 Apr 2008 01:53:33 -0000	1.288
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -45,9 +45,13 @@
 
 # fixed upstream
 Patch7: filechooser-iconsize.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=521032
 Patch8: filechooser-auth.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=467698
+Patch9: tab-drag-crash.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -131,6 +135,7 @@
 %patch6 -p1 -b .implicit-g_fopen
 %patch7 -p1 -b .filechooser-iconsize
 %patch8 -p1 -b .filechooser-auth
+%patch9 -p1 -b .tab-drag-crash
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -313,6 +318,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Apr  9 2008 Matthias Clasen  <mclasen at redhat.com> - 2.12.9-5
+- Fix a possible crash when dragging notebook tabs
+
 * Wed Apr  9 2008 Matthias Clasen  <mclasen at redhat.com> - 2.12.9-4
 - Make sure we use the right icon size for all icons in the
   file chooser (Fix by Tomas Bzatek)