[gigolo] Fix crash when closing gigolo from the toolbar (#748228)

[Christoph Wickert]

commit 185cfc92b949c114357654f46e292887ecc36fcc
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Oct 23 23:49:53 2011 +0200

    Fix crash when closing gigolo from the toolbar (#748228)

 gigolo-0.4.1-fix-crash-748228.patch |   24 ++++++++++++++++++++++++
 gigolo.spec                         |   13 ++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)
---
diff --git a/gigolo-0.4.1-fix-crash-748228.patch b/gigolo-0.4.1-fix-crash-748228.patch
new file mode 100644
index 0000000..601c873
--- /dev/null
+++ b/gigolo-0.4.1-fix-crash-748228.patch
@@ -0,0 +1,24 @@
+From 0e53ec5c0e6202a3eebfe8f986cdff845c6e37e3 Mon Sep 17 00:00:00 2001
+From: Enrico Tröger <enrico at xfce.org>
+Date: Sun, 23 Oct 2011 21:34:33 +0000
+Subject: Just unref the toolbar widget instead of explicitly destroying it.
+
+This fixes crashing with GTK 2.24.7 on exit though not exactly sure why it
+happens. But unref'ing helps and the toolbar widget is destroyed together
+with the main window afterwards.
+---
+diff --git a/src/window.c b/src/window.c
+index bede8f4..9bfa14e 100644
+--- a/src/window.c
++++ b/src/window.c
+@@ -145,7 +145,7 @@ static void gigolo_window_destroy(GigoloWindow *window)
+ 	gtk_widget_destroy(priv->systray_icon_popup_menu);
+ 	gtk_widget_destroy(priv->swin_treeview);
+ 	gtk_widget_destroy(priv->swin_iconview);
+-	gtk_widget_destroy(priv->toolbar);
++	g_object_unref(priv->toolbar);
+ 	g_object_unref(priv->action_group);
+ 	g_object_unref(priv->systray_icon);
+ 	g_object_unref(priv->systray_icon_popup_menu);
+--
+cgit 
diff --git a/gigolo.spec b/gigolo.spec
index 32b345f..ed679ba 100644
--- a/gigolo.spec
+++ b/gigolo.spec
@@ -1,14 +1,17 @@
 Name:           gigolo
 Version:        0.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GIO/GVFS management application
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://goodies.xfce.org/projects/applications/gigolo/
 Source0:        http://archive.xfce.org/src/apps/%{name}/0.4/%{name}-%{version}.tar.bz2
-# http://git.xfce.org/apps/gigolo/commit/?id=95a37d4ce28187b90c175edcd6230ec2b7f9f5d8
+# http://git.xfce.org/apps/gigolo/commit/?id=95a37d4c
 Patch0:         gigolo-0.4.1-update-de.po.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=748228
+# patch from http://git.xfce.org/apps/gigolo/commit/?id=0e53ec5c
+Patch1:         gigolo-0.4.1-fix-crash-748228.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python
@@ -29,7 +32,8 @@ bookmarks of such.
 
 %prep
 %setup -q
-%patch0 -p1 -b .old
+%patch0 -p1 -b .updat
+%patch1 -p1 -b .fix
 
 %build
 export CFLAGS="%{optflags}"
@@ -70,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gigolo.1.gz
 
 %changelog
+* Sun Oct 23 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-3
+- Fix crash when closing gigolo from the toolbar (#748228)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild