From 30b3f7e7cc39d5f3153e78a5b683c33f69949c3b Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Fri, 2 Dec 2011 16:26:35 +0300 Subject: [PATCH] Disable the popup menu during a shift + drag action and a minor fix to the shift selection code. Fixes Bug 7525. --- src/xfce-desktop.c | 2 +- src/xfdesktop-icon-view.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c index cd98ae7..2628065 100644 --- a/src/xfce-desktop.c +++ b/src/xfce-desktop.c @@ -861,7 +861,7 @@ xfce_desktop_button_press_event(GtkWidget *w, xfce_desktop_popup_secondary_root_menu(XFCE_DESKTOP(w), button, evt->time); return TRUE; - } else if(button == 3 || (button == 1 && (state & GDK_SHIFT_MASK))) { + } else if(button == 3) { xfce_desktop_popup_root_menu(XFCE_DESKTOP(w), button, evt->time); return TRUE; diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c index 0736006..7bf6dd0 100644 --- a/src/xfdesktop-icon-view.c +++ b/src/xfdesktop-icon-view.c @@ -1855,7 +1855,7 @@ xfdesktop_icon_view_select_between(XfdesktopIconView *icon_view, { if(start_row > end_row || (start_row == end_row && start_col > end_col)) { /* flip start and end */ - guint16 tmpr = start_row, tmpc = end_row; + guint16 tmpr = start_row, tmpc = start_col; start_row = end_row; start_col = end_col; -- 1.7.5.4