[Xfce4-commits] <xfdesktop:master> Fix menu without desktop icons.

[Nick Schermer]

Updating branch refs/heads/master
         to b33b01b799476ab680823fd4ded659bac6ac5123 (commit)
       from b34b76e5b3a67d0f7d10e431079f9d260204b9f2 (commit)

commit b33b01b799476ab680823fd4ded659bac6ac5123
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Mar 31 18:54:09 2012 +0200

    Fix menu without desktop icons.
    
    Previous fix compiled but broke the menu.

 src/xfce-desktop.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
index 13b7c3d..38a382f 100644
--- a/src/xfce-desktop.c
+++ b/src/xfce-desktop.c
@@ -907,15 +907,15 @@ xfce_desktop_button_press_event(GtkWidget *w,
     g_return_val_if_fail(XFCE_IS_DESKTOP(w), FALSE);
 
     if(evt->type == GDK_BUTTON_PRESS) {
+        if(button == 3 || (button == 1 && (state & GDK_SHIFT_MASK))) {
 #ifdef ENABLE_DESKTOP_ICONS
-        if(XFCE_DESKTOP(w)->priv->icons_style == XFCE_DESKTOP_ICON_STYLE_NONE
-           && (button == 3 || (button == 1 && (state & GDK_SHIFT_MASK)))) {
+            if(XFCE_DESKTOP(w)->priv->icons_style != XFCE_DESKTOP_ICON_STYLE_NONE)
+                return FALSE;
+#endif
             xfce_desktop_popup_root_menu(XFCE_DESKTOP(w),
                                          button,
                                          evt->time);
-        } else
-#endif
-        if(button == 2 || (button == 1 && (state & GDK_SHIFT_MASK)
+        } else if(button == 2 || (button == 1 && (state & GDK_SHIFT_MASK)
                                   && (state & GDK_CONTROL_MASK)))
         {
             xfce_desktop_popup_secondary_root_menu(XFCE_DESKTOP(w),