[Xfce4-commits] <xfce4-netload-plugin:master> Bug 7083: Port from libxfcegui4 to libxfce4ui

[Mike Massonnet]

Updating branch refs/heads/master
         to e683d98fea5ebc970247d5622ca05490a2cc3249 (commit)
       from 11313a0907775281a94400d5fc8da2f4967ea83d (commit)

commit e683d98fea5ebc970247d5622ca05490a2cc3249
Author: Christoph J. Thompson <cjsthompson at gmail.com>
Date:   Sat Jan 7 15:53:08 2012 +0100

    Bug 7083: Port from libxfcegui4 to libxfce4ui

 configure.ac.in          |    2 +-
 panel-plugin/Makefile.am |    4 ++--
 panel-plugin/netload.c   |    5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 0348bfa..3baaa14 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -56,7 +56,7 @@ dnl configure the panel plugin
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
 
 dnl configure the libxfcegui4
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
 
 dnl Check for i18n support
 XDT_I18N([@LINGUAS@])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 0635d67..2163277 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -17,12 +17,12 @@ xfce4_netload_plugin_SOURCES =						\
 xfce4_netload_plugin_CFLAGS =						\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	@LIBXFCE4PANEL_CFLAGS@				\
-	@LIBXFCEGUI4_CFLAGS@
+	@LIBXFCE4UI_CFLAGS@
 
 xfce4_netload_plugin_LDADD =						\
 	@SOLLIBS@                                   			\
 	@LIBXFCE4PANEL_LIBS@                                   			\
-	@LIBXFCEGUI4_LIBS@
+	@LIBXFCE4UI_LIBS@
 
 # .desktop file
 #
diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c
index 719d6f5..0c596bd 100644
--- a/panel-plugin/netload.c
+++ b/panel-plugin/netload.c
@@ -30,7 +30,7 @@
 #include <gtk/gtk.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 
 
@@ -527,7 +527,8 @@ static void setup_monitor(t_global_monitor *global, gboolean supress_warnings)
     if (!init_netload( &(global->monitor->data), global->monitor->options.network_device)
             && !supress_warnings)
     {
-        xfce_err (_("%s: Error in initalizing:\n%s"),
+        xfce_dialog_show_error (NULL, NULL,
+	    _("%s: Error in initalizing:\n%s"),
             _(APP_NAME),
             _(errormessages[
                 global->monitor->data.errorcode == 0