[Xfce4-commits] [xfce/xfdesktop] 01/01: Fix build with --disable-desktop-icons

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfdesktop.

commit e5bbfcc150a3f1596c2264fecb1294599f7e5217
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Aug 3 10:37:48 2014 +0300

    Fix build with --disable-desktop-icons
---
 src/xfce-desktop.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
index 6e9e942..2166803 100644
--- a/src/xfce-desktop.c
+++ b/src/xfce-desktop.c
@@ -174,7 +174,10 @@ static void xfce_desktop_set_single_workspace_number(XfceDesktop *desktop,
 static gboolean xfce_desktop_get_single_workspace_mode(XfceDesktop *desktop);
 static gint xfce_desktop_get_current_workspace(XfceDesktop *desktop);
 
+#ifdef ENABLE_DESKTOP_ICONS
 static void hidden_state_changed_cb(GObject *object, XfceDesktop *desktop);
+#endif
+
 
 static guint signals[N_SIGNALS] = { 0, };
 
@@ -1452,6 +1455,7 @@ xfce_desktop_set_icon_style(XfceDesktop *desktop,
 #endif
 }
 
+#ifdef ENABLE_DESKTOP_ICONS
 static gboolean
 hidden_idle_cb(gpointer user_data)
 {
@@ -1480,7 +1484,6 @@ hidden_state_changed_cb(GObject *object,
 {
     g_return_if_fail(XFCE_IS_DESKTOP(desktop));
 
-#ifdef ENABLE_DESKTOP_ICONS
     if(desktop->priv->icon_view) {
         g_signal_handlers_disconnect_by_func(object,
                                              G_CALLBACK(hidden_state_changed_cb),
@@ -1489,8 +1492,8 @@ hidden_state_changed_cb(GObject *object,
 
     /* We have to do this in an idle callback */
     g_idle_add(hidden_idle_cb, desktop);
-#endif
 }
+#endif /* ENABLE_DESKTOP_ICONS */
 
 XfceDesktopIconStyle
 xfce_desktop_get_icon_style(XfceDesktop *desktop)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.