From 499efc06d4a9220a5b0500caa3bc80870920cd0d Mon Sep 17 00:00:00 2001 From: Romain Bouvier Date: Mon, 3 Jan 2011 11:51:11 +0100 Subject: [PATCH] Port xfce4-verve-plugin to libxfce4ui --- configure.ac.in | 6 +++--- panel-plugin/Makefile.am | 4 ++-- panel-plugin/verve-plugin.c | 12 +++++++----- panel-plugin/verve.c | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 758fad6..ba14044 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -53,9 +53,9 @@ 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([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.7.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [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 06d68ef..a26856d 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -19,7 +19,7 @@ xfce4_verve_plugin_CFLAGS = \ @LIBEXO_CFLAGS@ \ @LIBXFCE4PANEL_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ \ + @LIBXFCE4UI_CFLAGS@ \ @LIBPCRE_CFLAGS@ \ @GLIB_CFLAGS@ \ @GTHREAD_CFLAGS@ @@ -28,7 +28,7 @@ xfce4_verve_plugin_LDADD = \ @LIBEXO_LIBS@ \ @LIBXFCE4PANEL_LIBS@ \ @LIBXFCE4UTIL_LIBS@ \ - @LIBXFCEGUI4_LIBS@ \ + @LIBXFCE4UI_LIBS@ \ @LIBPCRE_LIBS@ \ @GLIB_LIBS@ \ @GTHREAD_LIBS@ diff --git a/panel-plugin/verve-plugin.c b/panel-plugin/verve-plugin.c index ecc9015..c760e43 100644 --- a/panel-plugin/verve-plugin.c +++ b/panel-plugin/verve-plugin.c @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include "verve.h" #include "verve-env.h" @@ -411,7 +411,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); @@ -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/panel-plugin/verve.c b/panel-plugin/verve.c index 420cd58..bce6e2f 100644 --- a/panel-plugin/verve.c +++ b/panel-plugin/verve.c @@ -25,7 +25,7 @@ #include -#include +#include #include "verve.h" #include "verve-env.h" -- 1.7.3.4