[Xfce4-commits] [panel-plugins/xfce4-clipman-plugin] 01/01: Bring back libxfce4util

[noreply at xfce.org]

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

ochosi pushed a commit to branch master
in repository panel-plugins/xfce4-clipman-plugin.

commit c2b7f22a1bff20984a431813c17be95880376c3e
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Jun 2 23:09:12 2016 +0200

    Bring back libxfce4util
---
 configure.ac.in          | 1 +
 panel-plugin/Makefile.am | 6 +++++-
 panel-plugin/actions.c   | 1 +
 panel-plugin/collector.c | 1 +
 panel-plugin/history.c   | 1 +
 panel-plugin/plugin.c    | 1 +
 tests/Makefile.am        | 4 ++--
 7 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 68db3ca..32cb22a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -65,6 +65,7 @@ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.32.0])
 XDT_CHECK_PACKAGE([GDKX], [gdk-x11-3.0], [3.14.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.14.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
 XDT_CHECK_PACKAGE([LIBXPROTO], [xproto], [7.0.0])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 5a67352..26259f2 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS =								\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	$(NULL)
 
-bin_PROGRAMS = xfce4-clipman xfce4-popup-clipman xfce4-clipman-settings 
+bin_PROGRAMS = xfce4-clipman xfce4-popup-clipman xfce4-clipman-settings
 
 #
 # Maintainer Mode
@@ -94,6 +94,7 @@ xfce4_clipman_CFLAGS =							\
 	@LIBXTST_CFLAGS@						\
 	@GDKX_CFLAGS@							\
 	@GTK_CFLAGS@							\
+	@LIBXFCE4UTIL_CFLAGS@					\
 	@LIBXFCE4UI_CFLAGS@						\
 	@XFCONF_CFLAGS@							\
 	$(NULL)
@@ -105,6 +106,7 @@ xfce4_clipman_LDADD =							\
 	@LIBXTST_LIBS@							\
 	@GDKX_LIBS@							\
 	@GTK_LIBS@							\
+	@LIBXFCE4UTIL_LIBS@						\
 	@LIBXFCE4UI_LIBS@						\
 	@XFCONF_LIBS@							\
 	@QRENCODE_LIBS@							\
@@ -134,6 +136,7 @@ libclipman_la_CFLAGS =							\
 	@LIBXTST_CFLAGS@						\
 	@GDKX_CFLAGS@							\
 	@GTK_CFLAGS@							\
+	@LIBXFCE4UTIL_CFLAGS@					\
 	@LIBXFCE4UI_CFLAGS@						\
 	@LIBXFCE4PANEL_CFLAGS@						\
 	@XFCONF_CFLAGS@							\
@@ -155,6 +158,7 @@ libclipman_la_LIBADD =							\
 	@LIBXTST_LIBS@							\
 	@GDKX_LIBS@							\
 	@GTK_LIBS@							\
+	@LIBXFCE4UTIL_LIBS@						\
 	@LIBXFCE4UI_LIBS@						\
 	@LIBXFCE4PANEL_LIBS@						\
 	@XFCONF_LIBS@							\
diff --git a/panel-plugin/actions.c b/panel-plugin/actions.c
index 07d2b02..929e5c8 100644
--- a/panel-plugin/actions.c
+++ b/panel-plugin/actions.c
@@ -37,6 +37,7 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <libxfce4ui/libxfce4ui.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "common.h"
 
diff --git a/panel-plugin/collector.c b/panel-plugin/collector.c
index 685c302..bf6d924 100644
--- a/panel-plugin/collector.c
+++ b/panel-plugin/collector.c
@@ -25,6 +25,7 @@
 #include "common.h"
 #include "actions.h"
 #include "history.h"
+#include <libxfce4util/libxfce4util.h>
 
 #include "collector.h"
 
diff --git a/panel-plugin/history.c b/panel-plugin/history.c
index d49e125..abec3bc 100644
--- a/panel-plugin/history.c
+++ b/panel-plugin/history.c
@@ -23,6 +23,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "common.h"
 
diff --git a/panel-plugin/plugin.c b/panel-plugin/plugin.c
index 629e751..a0050d6 100644
--- a/panel-plugin/plugin.c
+++ b/panel-plugin/plugin.c
@@ -25,6 +25,7 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <xfconf/xfconf.h>
+#include <libxfce4util/libxfce4util.h>
 
 #ifdef PANEL_PLUGIN
 #include <libxfce4panel/libxfce4panel.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ce9eb01..7fb06fa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,8 +11,8 @@ AM_CPPFLAGS =								\
 
 check_PROGRAMS = test-actions test-daemon test-targets test-xfakekey
 test_actions_SOURCES = test_actions.c ../panel-plugin/actions.c ../panel-plugin/actions.h ../panel-plugin/common.h
-test_actions_CFLAGS = @GTK_CFLAGS@ @LIBXFCE4UI_CFLAGS@
-test_actions_LDADD = @GTK_LIBS@ @LIBXFCE4UI_LIBS@
+test_actions_CFLAGS = @GTK_CFLAGS@ @EXO_CFLAGS@ @LIBXFCE4UTIL_CFLAGS@ @LIBXFCE4UI_CFLAGS@
+test_actions_LDADD = @GTK_LIBS@ @EXO_LIBS@ @LIBXFCE4UTIL_LIBS@ @LIBXFCE4UI_LIBS@
 test_daemon_SOURCES = test_daemon.c
 test_daemon_CFLAGS = @GTK_CFLAGS@
 test_daemon_LDADD = $(top_builddir)/x11-clipboard-manager/libdaemon.la @GTK_LIBS@

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