[Xfce4-commits] <exo:master> Make the treeview work again with gtk 2.20 (bug #6230).

[Nick Schermer]

Updating branch refs/heads/master
         to cd80ae7747aa87ab6d72f08386b0fd4bea7f05b3 (commit)
       from 0f28d17dc94023f2fa1b18de80c385977ab483c6 (commit)

commit cd80ae7747aa87ab6d72f08386b0fd4bea7f05b3
Author: Nick Schermer <nick at xfce.org>
Date:   Tue May 11 20:57:11 2010 +0200

    Make the treeview work again with gtk 2.20 (bug #6230).

 exo/exo-tree-view.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c
index f7baa56..159f5b1 100644
--- a/exo/exo-tree-view.c
+++ b/exo/exo-tree-view.c
@@ -365,14 +365,7 @@ exo_tree_view_button_press_event (GtkWidget      *widget,
       && path != NULL && gtk_tree_selection_path_is_selected (selection, path))
     {
       /* check if we have to restore paths */
-      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;
-        }
-      else
+      if (G_LIKELY (selection->user_func != (GtkTreeSelectionFunc) exo_noop_false))
         {
           /* select all previously selected paths */
           for (lp = selected_paths; lp != NULL; lp = lp->next)
@@ -380,6 +373,15 @@ exo_tree_view_button_press_event (GtkWidget      *widget,
         }
     }
 
+  /* see bug http://bugzilla.xfce.org/show_bug.cgi?id=6230 for more information */
+  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;
+    }
+
   /* release the path (if any) */
   if (G_LIKELY (path != NULL))
     gtk_tree_path_free (path);