From 7678faa886606aa7ab8f5359eb70f46b33885729 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: May 20 2010 02:38:22 +0000
Subject: Add patch for xfce bug 6230


---

diff --git a/exo-6230-fix.patch b/exo-6230-fix.patch
new file mode 100644
index 0000000..e53394a
--- /dev/null
+++ b/exo-6230-fix.patch
@@ -0,0 +1,24 @@
+Bad fix for http://bugzilla.xfce.org/show_bug.cgi?id=6230
+
+This makes sure exo_noop_false is unset after parent's button handler has been called.
+The bug is still there in the "restore previous selection" code.
+
+diff -Nur exo-0.3.106/exo/exo-tree-view.c exo-0.3.106.new/exo/exo-tree-view.c
+--- exo-0.3.106/exo/exo-tree-view.c	2009-12-12 13:19:12.000000000 +0100
++++ exo-0.3.106.new/exo/exo-tree-view.c	2010-04-16 23:43:51.212286473 +0200
+@@ -373,6 +373,15 @@
+   /* call the parent's button press handler */
+   result = (*GTK_WIDGET_CLASS (exo_tree_view_parent_class)->button_press_event) (widget, event);
+ 
++  /* ugly fix for http://bugzilla.xfce.org/show_bug.cgi?id=6230 */
++  if (G_LIKELY (selection->user_func == (GtkTreeSelectionFunc) exo_noop_false))
++    {
++      /* just reset the select function (previously set to exo_noop_false),
++       * there's no clean way to do this, so what the heck.
++       */
++      selection->user_func = NULL;
++    }
++
+   /* restore previous selection if the path is still selected */
+   if (event->type == GDK_BUTTON_PRESS && (event->state & gtk_accelerator_get_default_mod_mask ()) == 0
+       && path != NULL && gtk_tree_selection_path_is_selected (selection, path))
diff --git a/exo.spec b/exo.spec
index ca4493c..e0f19ca 100644
--- a/exo.spec
+++ b/exo.spec
@@ -3,13 +3,14 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.106
-Release: 2%{?dist}
+Release: 3%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
 Source0: http://archive.xfce.org/src/xfce/exo/0.3/%{name}-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
+Patch1: exo-6230-fix.patch
 # to not bring https://bugzilla.redhat.com/show_bug.cgi?id=508823 back
 Patch2: exo-0.3.105-mount-utf8.patch
 Group: System Environment/Libraries
@@ -55,6 +56,7 @@ Python libraries and header files for the exo library.
 %setup -q
 
 %patch0 -p1 -b .x86_64-build
+%patch1 -p1 -b .6230
 %patch2 -p1 -b .utf8
 
 %build
@@ -137,6 +139,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sat Apr 24 2010 Kevin Fenzi <kevin@tummy.com> - 0.3.106-3
+- Add patch for xfce bug 6230
+
 * Thu Dec 17 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.3.106-2
 - Remove libtool archive from python-exo package