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

[Landry Breuil]

Updating branch refs/heads/master
         to ba3167019ae25cb340c36b676f038ec73bb47d98 (commit)
       from 592853aeed8df90e06f37d98e68c6110dc8ae232 (commit)

commit ba3167019ae25cb340c36b676f038ec73bb47d98
Author: Landry Breuil <landry at xfce.org>
Date:   Sun Dec 30 18:30:34 2012 +0100

    Port to libxfce4ui.
    
    While here only call g_thread_init() on glib < 2.32.

 configure.ac.in             |   16 +++++++---------
 panel-plugin/Makefile.am    |    6 ++----
 panel-plugin/verve-plugin.c |    8 +++++---
 scripts/Makefile.am         |    2 --
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 758fad6..9f9f49b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -35,8 +35,8 @@ AC_PROG_INTLTOOL()
 dnl **************************
 dnl *** Initialize libtool ***
 dnl **************************
-AC_DISABLE_STATIC()
-AC_PROG_LIBTOOL()
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
 dnl **********************************
 dnl *** Check for standard headers ***
@@ -51,12 +51,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([LIBEXO], [exo-1], [0.5.0])])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4])
+XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
 XDT_CHECK_PACKAGE([LIBPCRE], [libpcre], [5.0])
 
@@ -77,7 +75,7 @@ fi
 dnl ***********************************
 dnl *** Check for debugging support ***
 dnl ***********************************
-BM_DEBUG_SUPPORT()
+XDT_FEATURE_DEBUG()
 
 AC_OUTPUT([
 Makefile
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 06d68ef..69fb4bd 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -18,19 +18,17 @@ xfce4_verve_plugin_CFLAGS = 						\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	@LIBEXO_CFLAGS@							\
 	@LIBXFCE4PANEL_CFLAGS@						\
+	@LIBXFCE4UI_CFLAGS@						\
 	@LIBXFCE4UTIL_CFLAGS@						\
-	@LIBXFCEGUI4_CFLAGS@						\
 	@LIBPCRE_CFLAGS@						\
-	@GLIB_CFLAGS@							\
 	@GTHREAD_CFLAGS@						
 
 xfce4_verve_plugin_LDADD = 						\
 	@LIBEXO_LIBS@							\
 	@LIBXFCE4PANEL_LIBS@						\
+	@LIBXFCE4UI_LIBS@						\
 	@LIBXFCE4UTIL_LIBS@						\
-	@LIBXFCEGUI4_LIBS@						\
 	@LIBPCRE_LIBS@							\
-	@GLIB_LIBS@							\
 	@GTHREAD_LIBS@
 
 if HAVE_DBUS
diff --git a/panel-plugin/verve-plugin.c b/panel-plugin/verve-plugin.c
index ecc9015..1403b2a 100644
--- a/panel-plugin/verve-plugin.c
+++ b/panel-plugin/verve-plugin.c
@@ -411,7 +411,7 @@ 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);
@@ -501,8 +501,10 @@ verve_plugin_new (XfcePanelPlugin *plugin)
   /* Set application name */
   g_set_application_name ("Verve");
 
+#if !GLIB_CHECK_VERSION (2, 30, 0)
   /* Init thread system */
   g_thread_init (NULL);
+#endif
 
   /* Init Verve mini-framework */
   verve_init ();
@@ -804,7 +806,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);
@@ -835,7 +837,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/scripts/Makefile.am b/scripts/Makefile.am
index 1a2851e..0be767b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -9,12 +9,10 @@ verve_focus_CFLAGS = 							\
 	-DDBUS_API_SUBJECT_TO_CHANGE					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	@DBUS_CFLAGS@							\
-	@GLIB_CFLAGS@							\
 	@LIBXFCE4UTIL_CFLAGS@						
 
 verve_focus_LDADD = 							\
 	@DBUS_LIBS@							\
-	@GLIB_LIBS@							\
 	@LIBXFCE4UTIL_LIBS@
 
 endif