[gtk3/f16] Fix rh #766352

Daniel Williams dcbw at fedoraproject.org
Thu Dec 15 23:35:04 UTC 2011


commit 807d417f501f14d75c835bebf0489e699037a813
Author: Dan Williams <dcbw at redhat.com>
Date:   Thu Dec 15 17:36:13 2011 -0600

    Fix rh #766352

 ...ilechooserdefault-Don-t-unref-value-twice.patch |   28 ++++++++++++++++++++
 gtk3.spec                                          |    7 ++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-filechooserdefault-Don-t-unref-value-twice.patch b/0001-filechooserdefault-Don-t-unref-value-twice.patch
new file mode 100644
index 0000000..d798f62
--- /dev/null
+++ b/0001-filechooserdefault-Don-t-unref-value-twice.patch
@@ -0,0 +1,28 @@
+From aca43f43be3886f1a0befda0178ebb94ea2cf7b1 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Tue, 29 Nov 2011 20:39:21 +0100
+Subject: [PATCH] filechooserdefault: Don't unref value twice
+
+Double unref was introduced in eb02dacb370e8b4e6ef62328d0c09673b1234b32
+
+https://bugzilla.gnome.org/show_bug.cgi?id=646461
+https://bugzilla.gnome.org/show_bug.cgi?id=664137
+---
+ gtk/gtkfilechooserdefault.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
+index e33b91e..a74aacc 100644
+--- a/gtk/gtkfilechooserdefault.c
++++ b/gtk/gtkfilechooserdefault.c
+@@ -10127,7 +10127,6 @@ list_row_activated (GtkTreeView           *tree_view,
+   if (is_folder && file)
+     {
+       change_folder_and_display_error (impl, file, FALSE);
+-      g_object_unref (file);
+       goto out;
+     }
+ 
+-- 
+1.7.7.4
+
diff --git a/gtk3.spec b/gtk3.spec
index 65aa8b3..f56ebfb 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -9,7 +9,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk3
 Version: 3.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -19,6 +19,7 @@ Source1: im-cedilla.conf
 
 Patch0: 0001-XI2-Push-error-traps-around-XIQueryDevice-calls.patch
 Patch1: gtk3-super.patch
+Patch2: 0001-filechooserdefault-Don-t-unref-value-twice.patch
 
 BuildRequires: gnome-common autoconf automake intltool gettext
 BuildRequires: atk-devel >= %{atk_version}
@@ -114,6 +115,7 @@ widget toolkit.
 %setup -q -n gtk+-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -238,6 +240,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Dec 15 2011 Dan Williams <dcbw at redhat.com> - 3.2.2-4
+- Fix crash in path bar of the file chooser dialog (rh #766352)
+
 * Thu Dec  8 2011 Matthias Clasen <mclasen at redhat.com> - 3.2.2-3
 - Fix handling of virtual modifiers when editing accelerators
 


More information about the scm-commits mailing list