Updating branch refs/heads/master
to 2bb01d73d30cb3a8f0a8f8e31a9ecd4acfe5acd1 (commit)
from cddf2b238a23272f7926108043edd6beee428dc8 (commit)
commit 2bb01d73d30cb3a8f0a8f8e31a9ecd4acfe5acd1
Merge: cddf2b2 885bbcf
Author: Sean Davis <smd.seanda...@gmail.com>
Date: Thu Jul 19 16:59:05 2012 -0400
Merge branch 'master' of https://github.com/ochosi/Parole
commit 885bbcf10ebbcb0093b1a65ebdb8613761c12aaf
Author: Simon Steinbeiss <och...@xfce.org>
Date: Thu Jul 19 22:23:17 2012 +0200
Use libxfce4ui instead of libxfcegui4 in tray-plugin
src/plugins/tray/Makefile.am | 4 ++--
src/plugins/tray/tray-provider.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/tray/Makefile.am b/src/plugins/tray/Makefile.am
index bb8fd79..b0a5ea8 100644
--- a/src/plugins/tray/Makefile.am
+++ b/src/plugins/tray/Makefile.am
@@ -20,7 +20,7 @@ tray_icon_la_SOURCES = \
tray_icon_la_CFLAGS = \
$(PLATFORM_CFLAGS) \
$(GTK_CFLAGS) \
- $(LIBXFCE4GUI_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBNOTIFY_CFLAGS)
@@ -45,4 +45,4 @@ EXTRA_DIST = \
$(desktop_in_files)
DISTCLEANFILES = \
- $(desktop_DATA)
\ No newline at end of file
+ $(desktop_DATA)
diff --git a/src/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
index 92bd078..e237b81 100644
--- a/src/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -33,7 +33,7 @@
#include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include "tray-provider.h"
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
