[Xfce4-commits] <xfce4-embed-plugin:master> Port the plugin to libxfce4ui.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 35f15c99c6e61a04b739dc1703e470fdc39b7179 (commit)
       from 22e9d56318559b99c31b5bf98ef5dea3cc9fd09d (commit)

commit 35f15c99c6e61a04b739dc1703e470fdc39b7179
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Apr 23 09:28:14 2011 +0200

    Port the plugin to libxfce4ui.

 configure.ac.in               |    6 +++---
 panel-plugin/Makefile.am      |   36 +++++++++++++++++-------------------
 panel-plugin/sample-dialogs.c |    2 +-
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 795fb3d..b159dca 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -72,9 +72,9 @@ dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
 
 dnl ***********************************
 dnl *** Check for debugging support ***
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index a6cb3e6..36cdd10 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,35 +1,33 @@
-# $Id$
-
-INCLUDES =								\
-	-I$(top_srcdir)							\
-	-DG_LOG_DOMAIN=\"xfce4-sample-plugin\"				\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
+INCLUDES = \
+	-I$(top_srcdir) \
+	-DG_LOG_DOMAIN=\"xfce4-sample-plugin\" \
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
 #
 # Sample plugin
 #
-plugin_PROGRAMS =							\
+plugin_PROGRAMS = \
 	xfce4-sample-plugin
 
-plugindir =								\
+plugindir = \
 	$(libexecdir)/xfce4/panel-plugins
 
-xfce4_sample_plugin_SOURCES =						\
-	sample.c							\
-	sample.h							\
-	sample-dialogs.c						\
+xfce4_sample_plugin_SOURCES = \
+	sample.c \
+	sample.h \
+	sample-dialogs.c \
 	sample-dialogs.h
 
-xfce4_sample_plugin_CFLAGS =						\
-	$(LIBXFCE4UTIL_CFLAGS)						\
-	$(LIBXFCEGUI4_CFLAGS)						\
-	$(LIBXFCE4PANEL_CFLAGS)						\
+xfce4_sample_plugin_CFLAGS = \
+	$(LIBXFCE4UTIL_CFLAGS) \
+	$(LIBXFCE4UI_CFLAGS) \
+	$(LIBXFCE4PANEL_CFLAGS) \
 	$(PLATFORM_CFLAGS)
 
-xfce4_sample_plugin_LDADD =						\
-	$(LIBXFCE4UTIL_LIBS)						\
-	$(LIBXFCEGUI4_LIBS)						\
+xfce4_sample_plugin_LDADD = \
+	$(LIBXFCE4UTIL_LIBS) \
+	$(LIBXFCE4UI_LIBS) \
 	$(LIBXFCE4PANEL_LIBS)
 
 #
diff --git a/panel-plugin/sample-dialogs.c b/panel-plugin/sample-dialogs.c
index 31ddc89..894b7ba 100644
--- a/panel-plugin/sample-dialogs.c
+++ b/panel-plugin/sample-dialogs.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 
 #include "sample.h"