rpms/gtk2/F-8 tab-label.patch,NONE,1.1 gtk2.spec,1.268,1.269
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Tue Dec 11 19:04:18 UTC 2007
- Previous message (by thread): rpms/gtk2/devel tab-label.patch,NONE,1.1 gtk2.spec,1.270,1.271
- Next message (by thread): rpms/cpanspec/devel .cvsignore, 1.17, 1.18 cpanspec.spec, 1.18, 1.19 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/extras/rpms/gtk2/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14853
Modified Files:
gtk2.spec
Added Files:
tab-label.patch
Log Message:
fix yet another tab-label related crash
tab-label.patch:
--- NEW FILE tab-label.patch ---
diff -up gtk+-2.12.3/gtk/gtknotebook.c.tab-label gtk+-2.12.3/gtk/gtknotebook.c
--- gtk+-2.12.3/gtk/gtknotebook.c.tab-label 2007-12-11 14:00:13.000000000 -0500
+++ gtk+-2.12.3/gtk/gtknotebook.c 2007-12-11 14:00:34.000000000 -0500
@@ -4349,12 +4349,15 @@ gtk_notebook_real_remove (GtkNotebook *n
gtk_widget_unparent (page->child);
tab_label = page->tab_label;
- g_object_ref (tab_label);
- gtk_notebook_remove_tab_label (notebook, page);
- if (destroying)
- gtk_widget_destroy (tab_label);
- g_object_unref (tab_label);
-
+ if (tab_label)
+ {
+ g_object_ref (tab_label);
+ gtk_notebook_remove_tab_label (notebook, page);
+ if (destroying)
+ gtk_widget_destroy (tab_label);
+ g_object_unref (tab_label);
+ }
+
if (notebook->menu)
{
gtk_container_remove (GTK_CONTAINER (notebook->menu),
Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-8/gtk2.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- gtk2.spec 5 Dec 2007 05:13:31 -0000 1.268
+++ gtk2.spec 11 Dec 2007 19:03:30 -0000 1.269
@@ -16,7 +16,7 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2
Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -34,6 +34,9 @@
# http://bugzilla.gnome.org/show_bug.cgi?id=488119
Patch3: system-log-crash.patch
+# fixed in upstream svn
+Patch4: tab-label.patch
+
BuildRequires: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version}
BuildRequires: glib2-devel >= %{glib2_version}
@@ -111,6 +114,7 @@
%patch1 -p1 -b .set-invisible-char-to-bullet
%patch2 -p1 -b .workaround
%patch3 -p1 -b .system-log-crash
+%patch4 -p1 -b .tab-label
for i in config.guess config.sub ; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -294,6 +298,9 @@
%{_datadir}/gtk-2.0
%changelog
+* Tue Dec 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.3-2
+- Fix yet another notebook tab related crash
+
* Wed Dec 5 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.3-1
- Update to 2.12.3
- Previous message (by thread): rpms/gtk2/devel tab-label.patch,NONE,1.1 gtk2.spec,1.270,1.271
- Next message (by thread): rpms/cpanspec/devel .cvsignore, 1.17, 1.18 cpanspec.spec, 1.18, 1.19 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list