[Xfce4-commits] <xfce4-cpufreq-plugin:master> Port plugin to libxfce4ui (bug #8051).

[Harald Judt]

Updating branch refs/heads/master
         to c25b820ed416ddbd890bd4e83237eeae612f1293 (commit)
       from 0f1c82d42f020331b35cbce179dfd5af008b6de8 (commit)

commit c25b820ed416ddbd890bd4e83237eeae612f1293
Author: Andreas Müller <schnitzeltony at gmx.de>
Date:   Wed Aug 7 10:26:36 2013 +0200

    Port plugin to libxfce4ui (bug #8051).
    
    Patch by Andreas Müller, slightly modified.

 configure.ac.in                        |   10 +++++-----
 panel-plugin/Makefile.am               |    4 ++--
 panel-plugin/xfce4-cpufreq-configure.c |    2 +-
 panel-plugin/xfce4-cpufreq-linux.c     |    4 ++--
 panel-plugin/xfce4-cpufreq-overview.c  |    2 +-
 panel-plugin/xfce4-cpufreq-plugin.c    |    6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 61a5518..635e9dd 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -36,11 +36,11 @@ dnl Check for i18n support
 XDT_I18N([@LINGUAS@])
 
 dnl configure the panel plugin
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.20.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.7.0])
 
 dnl ***********************************
 dnl *** Check for debugging support ***
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 68a4047..c8611fa 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -5,13 +5,13 @@ xfce4_cpufreq_plugin_CFLAGS =					\
 	-I$(top_srcdir)						\
 	@LIBXFCE4PANEL_CFLAGS@					\
 	@LIBXFCE4UTIL_CFLAGS@					\
-	@LIBXFCEGUI4_CFLAGS@					\
+	@LIBXFCE4UI_CFLAGS@					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
 xfce4_cpufreq_plugin_LDADD =					\
 	@LIBXFCE4PANEL_LIBS@					\
 	@LIBXFCE4UTIL_LIBS@					\
-	@LIBXFCEGUI4_LIBS@
+	@LIBXFCE4UI_LIBS@
 
 xfce4_cpufreq_plugin_SOURCES =					\
 	xfce4-cpufreq-plugin.h					\
diff --git a/panel-plugin/xfce4-cpufreq-configure.c b/panel-plugin/xfce4-cpufreq-configure.c
index 3de12c8..60af8a7 100644
--- a/panel-plugin/xfce4-cpufreq-configure.c
+++ b/panel-plugin/xfce4-cpufreq-configure.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include "xfce4-cpufreq-plugin.h"
 #include "xfce4-cpufreq-configure.h"
 
diff --git a/panel-plugin/xfce4-cpufreq-linux.c b/panel-plugin/xfce4-cpufreq-linux.c
index 9a27419..00c6dd4 100644
--- a/panel-plugin/xfce4-cpufreq-linux.c
+++ b/panel-plugin/xfce4-cpufreq-linux.c
@@ -27,7 +27,7 @@
 #include "xfce4-cpufreq-plugin.h"
 #include "xfce4-cpufreq-linux.h"
 
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #ifndef _
 # include <libintl.h>
@@ -410,7 +410,7 @@ cpufreq_linux_init (void)
 	{
 		if (cpuFreq->options->show_warning)
 		{
-			xfce_warn (_("Your system does not support cpufreq.\nThe applet only shows the current cpu frequency"));
+			xfce_dialog_show_warning (NULL, NULL, _("Your system does not support cpufreq.\nThe applet only shows the current cpu frequency"));
 			cpuFreq->options->show_warning = FALSE;
 		}
 
diff --git a/panel-plugin/xfce4-cpufreq-overview.c b/panel-plugin/xfce4-cpufreq-overview.c
index a186f30..c4937bf 100644
--- a/panel-plugin/xfce4-cpufreq-overview.c
+++ b/panel-plugin/xfce4-cpufreq-overview.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #ifndef _
 # include <libintl.h>
 # define _(String) gettext (String)
diff --git a/panel-plugin/xfce4-cpufreq-plugin.c b/panel-plugin/xfce4-cpufreq-plugin.c
index 1b3992f..d6340f5 100644
--- a/panel-plugin/xfce4-cpufreq-plugin.c
+++ b/panel-plugin/xfce4-cpufreq-plugin.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #ifndef _
 # include <libintl.h>
 # define _(String) gettext (String)
@@ -331,7 +331,7 @@ cpufreq_construct (XfcePanelPlugin *plugin)
 
 #ifdef __linux__
 	if (cpufreq_linux_init () == FALSE)
-		xfce_err (_("Your system is not configured correctly to support cpu frequency scaling !"));
+		xfce_dialog_show_error (NULL, NULL, _("Your system is not configured correctly to support cpu frequency scaling !"));
 
 	gtk_widget_set_size_request (GTK_WIDGET (plugin), -1, -1);
 	cpufreq_widgets ();
@@ -341,7 +341,7 @@ cpufreq_construct (XfcePanelPlugin *plugin)
 			(GSourceFunc) cpufreq_update_cpus,
 			NULL);
 #else
-	xfce_err (_("Your system is not supported yet !"));
+	xfce_dialog_show_error (NULL, NULL, _("Your system is not supported yet !"));
 #endif /* __linux__ */
 
 	g_signal_connect (plugin, "free-data", G_CALLBACK (cpufreq_free),