[Xfce4-commits] <xfdesktop:master> Fix compilation.

[Nick Schermer]

Updating branch refs/heads/master
         to c8bb045769b38451b98b8947faa346629ed2c41d (commit)
       from 49d718ab12b99f0c541f0c5a9407106657894e34 (commit)

commit c8bb045769b38451b98b8947faa346629ed2c41d
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Mar 25 14:11:06 2012 +0200

    Fix compilation.

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

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