Updating branch refs/heads/master
to b8779cc8caff8fe28480f8c31188d880fd4b9247 (commit)
from cb916736731da50ee3c8bdf5087e708d3f4e5841 (commit)
commit b8779cc8caff8fe28480f8c31188d880fd4b9247
Author: Enrico Tröger <enrico.troe...@uvena.de>
Date: Sat May 5 00:14:53 2012 +0200
Replace libxfcegui4 by libxfce4ui
configure.ac.in | 1 +
lib/Makefile.am | 4 ++--
panel-plugin/Makefile.am | 4 ++--
panel-plugin/xfce4-dict-plugin.c | 3 +--
panel-plugin/xfce4-dict-plugin.desktop.in.in | 7 -------
5 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index a9162ba..3bf62b7 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -55,6 +55,7 @@ dnl ***********************************
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0.0])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0.0])
XDT_CHECK_PACKAGE([X11], [x11])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ccb68ae..5eac26f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -26,14 +26,14 @@ libdict_la_SOURCES =
\
libdict_la_CFLAGS =
\
-I$(top_srcdir)
\
- $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@GTHREAD_CFLAGS@
libdict_la_LIBADD =
\
$(LIBXFCE4PANEL_LIBS) \
- $(LIBXFCEGUI4_LIBS)
\
+ $(LIBXFCE4UI_LIBS)
\
@GTHREAD_LIBS@
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 02d6315..0eac716 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -9,7 +9,7 @@ libxfce4dict_la_SOURCES =
\
libxfce4dict_la_CFLAGS = \
-I$(top_srcdir)
\
-I$(top_srcdir)/lib
\
- $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
-DG_LOG_DOMAIN=\"xfce4-dict-plugin\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@@ -17,7 +17,7 @@ libxfce4dict_la_CFLAGS =
\
libxfce4dict_la_LIBADD = \
$(LIBXFCE4PANEL_LIBS) \
- $(LIBXFCEGUI4_LIBS)
\
+ $(LIBXFCE4UI_LIBS)
\
@GTHREAD_LIBS@
\
@X11_LIBS@
\
$(top_builddir)/lib/libdict.la
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index 4f6fb30..1b3198b 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -24,9 +24,8 @@
#include <stdlib.h>
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfce4panel/xfce-panel-convenience.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/panel-plugin/xfce4-dict-plugin.desktop.in.in
b/panel-plugin/xfce4-dict-plugin.desktop.in.in
deleted file mode 100644
index 75a9433..0000000
--- a/panel-plugin/xfce4-dict-plugin.desktop.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Xfce Panel]
-Type=X-XFCE-PanelPlugin
-Encoding=UTF-8
-_Name=Dictionary
-_Comment=A plugin to query different dictionaries.
-Icon=xfce4-dict
-X-XFCE-Exec=@PLUGIN_PATH@/xfce4-dict-plugin
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
