From 618f82621b6c0f5399a7f53cfa3ed252af33f0d0 Mon Sep 17 00:00:00 2001
From: Romain Bouvier <skunnyk@archlinux.fr>
Date: Thu, 13 May 2010 20:00:36 +0200
Subject: [PATCH] Port xfce4-verve-plugin to libxfce4ui

---
 configure.in.in                   |    7 ++++---
 panel-plugin/Makefile.am          |    2 ++
 panel-plugin/verve-dbus-service.c |    2 +-
 panel-plugin/verve-plugin.c       |   12 +++++++-----
 panel-plugin/verve.c              |    2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 95234fc..b8513d4 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -52,9 +52,10 @@ XDT_I18N([@LINGUAS@])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.3])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.7.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
 XDT_CHECK_PACKAGE([LIBPCRE], [libpcre], [5.0])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 08694d5..9eb28d1 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -19,6 +19,7 @@ xfce4_verve_plugin_CFLAGS = 						\
 	-I$(top_srcdir)							\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	@LIBEXO_CFLAGS@							\
+	@LIBXFCE4UI_CFLAGS@						\
 	@LIBXFCE4PANEL_CFLAGS@						\
 	@LIBXFCE4UTIL_CFLAGS@						\
 	@LIBPCRE_CFLAGS@						\
@@ -27,6 +28,7 @@ xfce4_verve_plugin_CFLAGS = 						\
 
 xfce4_verve_plugin_LDFLAGS = 						\
 	@LIBEXO_LIBS@							\
+	@LIBXFCE4UI_LIBS@						\
 	@LIBXFCE4PANEL_LIBS@						\
 	@LIBXFCE4UTIL_LIBS@						\
 	@LIBPCRE_LIBS@							\
diff --git a/panel-plugin/verve-dbus-service.c b/panel-plugin/verve-dbus-service.c
index f64e603..19bd7f1 100644
--- a/panel-plugin/verve-dbus-service.c
+++ b/panel-plugin/verve-dbus-service.c
@@ -35,7 +35,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus.h>
 
-#include <libxfce4panel/xfce-panel-plugin.h>
+#include <libxfce4panel/libxfce4panel.h>
 
 #include "verve-dbus-service.h"
 
diff --git a/panel-plugin/verve-plugin.c b/panel-plugin/verve-plugin.c
index bc98edb..9e8ea13 100644
--- a/panel-plugin/verve-plugin.c
+++ b/panel-plugin/verve-plugin.c
@@ -34,8 +34,8 @@
 #include <gtk/gtk.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4panel/libxfce4panel.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #include "verve.h"
 #include "verve-env.h"
@@ -412,7 +412,9 @@ verve_plugin_keypress_cb (GtkWidget   *entry,
             gchar *msg = g_strconcat (_("Could not execute command:"), " ", command, NULL);
 
             /* Display error message dialog */
-            xfce_err (msg);
+            xfce_dialog_show_error (NULL,
+                                    NULL,
+                                    msg);
 
             /* Free message */
             g_free (msg);
@@ -805,7 +807,7 @@ verve_plugin_properties (XfcePanelPlugin *plugin,
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 2);
 
   /* Frame for appearance settings */
-  frame = xfce_create_framebox (_("Appearance"), &bin1);
+  frame = xfce_gtk_frame_box_new (_("Appearance"), &bin1);
   gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
@@ -836,7 +838,7 @@ verve_plugin_properties (XfcePanelPlugin *plugin,
   g_signal_connect (size_spin, "value-changed", G_CALLBACK (verve_plugin_size_changed), verve);
 
   /* Frame for behaviour settings */
-  frame = xfce_create_framebox (_("Behaviour"), &bin2);
+  frame = xfce_gtk_frame_box_new (_("Behaviour"), &bin2);
   gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
diff --git a/panel-plugin/verve.c b/panel-plugin/verve.c
index f2bf56e..55e7f69 100644
--- a/panel-plugin/verve.c
+++ b/panel-plugin/verve.c
@@ -26,7 +26,7 @@
 
 #include <glib-object.h>
 
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #include "verve.h"
 #include "verve-env.h"
-- 
1.7.1