[Xfce4-commits] <xfdesktop:xfce-4.6> fix compilation when libexo isn't present

[Brian J. Tarricone]

Updating branch refs/heads/xfce-4.6
         to 85fa707daf6686a71613b4955ac5d29a4eff9de5 (commit)
       from 5a7e8e019fc153a88fa7be90974ddfb112d2c69b (commit)

commit 85fa707daf6686a71613b4955ac5d29a4eff9de5
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Wed Aug 19 22:24:13 2009 -0700

    fix compilation when libexo isn't present

 src/xfdesktop-clipboard-manager.c |    3 +++
 src/xfdesktop-icon-view.c         |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/xfdesktop-clipboard-manager.c b/src/xfdesktop-clipboard-manager.c
index 709d49b..8635d3b 100644
--- a/src/xfdesktop-clipboard-manager.c
+++ b/src/xfdesktop-clipboard-manager.c
@@ -37,6 +37,9 @@
 #include "xfdesktop-file-utils.h"
 #include "xfdesktop-clipboard-manager.h"
 
+#ifndef I_
+#define I_(str)  g_intern_static_string(str)
+#endif
 
 
 enum
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index a94c700..afa6c51 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -38,6 +38,8 @@
 
 #ifdef HAVE_LIBEXO
 #include <exo/exo.h>
+#else
+#define I_(str)  g_intern_static_string(str)
 #endif
 
 #include "xfdesktop-icon-view.h"
@@ -1146,7 +1148,9 @@ xfdesktop_icon_view_leave_notify(GtkWidget *widget,
     XfdesktopIconView *icon_view = XFDESKTOP_ICON_VIEW(user_data);
     
     if(icon_view->priv->item_under_pointer) {
+#ifdef HAVE_LIBEXO
         XfdesktopIcon *icon = icon_view->priv->item_under_pointer;
+#endif
         icon_view->priv->item_under_pointer = NULL;
 #ifdef HAVE_LIBEXO
         xfdesktop_icon_view_invalidate_icon(icon_view, icon);