Put double click on a frame link back.

svn path=/trunk/; revision=23644

1 files changed, 8 insertions, 3 deletions

diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index c2f61a42d8..5b292ae6ad 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.c
@@ -2046,13 +2046,15 @@ tree_view_select(GtkWidget *widget, GdkEventButton *event)
             node = gtk_ctree_node_nth(ctree, row);
             g_assert(node);
 
-            gtk_ctree_select(ctree, node);
-
             /* if that's a doubleclick, try to follow the link */
             if(event->type == GDK_2BUTTON_PRESS) {
                 fi = gtk_ctree_node_get_row_data(ctree, node);
                 tree_view_follow_link(fi);
             }
+            else if (((GdkEventButton *)event)->button != 1) {
+                /* if button == 1 gtk_ctree_select is already (or will be) called by the widget */
+                gtk_ctree_select(ctree, node);
+            }
         } else {
             return FALSE;
         }
@@ -2066,7 +2068,6 @@ tree_view_select(GtkWidget *widget, GdkEventButton *event)
                                           &path, NULL, NULL, NULL))
         {
             sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
-            gtk_tree_selection_select_path(sel, path);
 
             /* if that's a doubleclick, try to follow the link */
             if(event->type == GDK_2BUTTON_PRESS) {
@@ -2079,6 +2080,10 @@ tree_view_select(GtkWidget *widget, GdkEventButton *event)
                     tree_view_follow_link(fi);
                 }
             }
+            else if (((GdkEventButton *)event)->button != 1) {
+                /* if button == 1 gtk_tree_selection_select_path is already (or will be) called by the widget */
+                gtk_tree_selection_select_path(sel, path);
+            }
         } else {
             return FALSE;
         }