[Xfce4-commits] r26293 - in xfdesktop: branches/xfce_4_4/src trunk/src

[Brian Tarricone]

Author: kelnos
Date: 2007-11-15 06:22:11 +0000 (Thu, 15 Nov 2007)
New Revision: 26293

Modified:
   xfdesktop/branches/xfce_4_4/src/xfdesktop-icon-view.c
   xfdesktop/trunk/src/xfdesktop-icon-view.c
Log:
ok, this should fix the annoying spurious drag when double-clicking
a volume icon that fails to mount (bug 3426)


Modified: xfdesktop/branches/xfce_4_4/src/xfdesktop-icon-view.c
===================================================================
--- xfdesktop/branches/xfce_4_4/src/xfdesktop-icon-view.c	2007-11-15 06:18:27 UTC (rev 26292)
+++ xfdesktop/branches/xfce_4_4/src/xfdesktop-icon-view.c	2007-11-15 06:22:11 UTC (rev 26293)
@@ -564,6 +564,11 @@
             icon_view->priv->first_clicked_item = NULL;
         }
     } else if(evt->type == GDK_2BUTTON_PRESS) {
+        /* be sure to cancel any pending drags that might have snuck through.
+         * this shouldn't happen.  */
+        icon_view->priv->definitely_dragging = FALSE;
+        icon_view->priv->maybe_begin_drag = FALSE;
+        
         if(evt->button == 1) {
             GList *icon_l = g_list_find_custom(icon_view->priv->icons, evt,
                                                (GCompareFunc)xfdesktop_check_icon_clicked);

Modified: xfdesktop/trunk/src/xfdesktop-icon-view.c
===================================================================
--- xfdesktop/trunk/src/xfdesktop-icon-view.c	2007-11-15 06:18:27 UTC (rev 26292)
+++ xfdesktop/trunk/src/xfdesktop-icon-view.c	2007-11-15 06:22:11 UTC (rev 26293)
@@ -565,6 +565,11 @@
             icon_view->priv->first_clicked_item = NULL;
         }
     } else if(evt->type == GDK_2BUTTON_PRESS) {
+        /* be sure to cancel any pending drags that might have snuck through.
+         * this shouldn't happen.  */
+        icon_view->priv->definitely_dragging = FALSE;
+        icon_view->priv->maybe_begin_drag = FALSE;
+        
         if(evt->button == 1) {
             GList *icon_l = g_list_find_custom(icon_view->priv->icons, evt,
                                                (GCompareFunc)xfdesktop_check_icon_clicked);