From b4d38088a67613fadeac852588cafebbc93d69ab Mon Sep 17 00:00:00 2001
From: Romain Bouvier <skunnyk@archlinux.fr>
Date: Sun, 17 Oct 2010 12:17:49 +0200
Subject: [PATCH] 0001-Port-xfce4-cpugraph-plugin-to-libxfce4ui

---
 configure.ac              |    4 ++--
 panel-plugin/Makefile.am  |    4 ++--
 panel-plugin/cpu.c        |    9 +++++++--
 panel-plugin/properties.c |    2 +-
 panel-plugin/settings.c   |    2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index c300ebd..1d781ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,9 @@ dnl Check for standard header files
 AC_HEADER_STDC
 
 dnl configure the panel plugin
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
 
 dnl translations
 XDT_I18N([@LINGUAS@])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 595c61f..6340196 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -3,11 +3,11 @@ plugin_PROGRAMS = xfce4-cpugraph-plugin
 
 xfce4_cpugraph_plugin_CFLAGS =					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
-	@LIBXFCEGUI4_CFLAGS@					\
+	@LIBXFCE4UI_CFLAGS@					\
 	@LIBXFCE4PANEL_CFLAGS@
 
 xfce4_cpugraph_plugin_LDADD =					\
-	@LIBXFCEGUI4_LIBS@					\
+	@LIBXFCE4UI_LIBS@					\
 	@LIBXFCE4PANEL_LIBS@
 
 xfce4_cpugraph_plugin_SOURCES =                                 \
diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c
index 63431f6..7dfd108 100644
--- a/panel-plugin/cpu.c
+++ b/panel-plugin/cpu.c
@@ -26,7 +26,7 @@
 #include "mode.h"
 #include "properties.h"
 
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4panel/xfce-hvbox.h>
 #ifndef _
 # include <libintl.h>
@@ -344,7 +344,12 @@ static gboolean command_cb( GtkWidget *w,GdkEventButton *event, CPUGraph *base )
 {
 	if( event->button == 1 && base->command )
 	{
-		xfce_exec( base->command, base->in_terminal, base->startup_notification, NULL );
+		GError *error = NULL;
+		if(!g_spawn_command_line_async(base->command, &error)) 
+		{
+			xfce_dialog_show_error(NULL, error, _("%s could not be launched"));
+			g_error_free(error);
+		}
 	}
 	return FALSE;
 }
diff --git a/panel-plugin/properties.c b/panel-plugin/properties.c
index 411fafd..ed191dd 100644
--- a/panel-plugin/properties.c
+++ b/panel-plugin/properties.c
@@ -26,7 +26,7 @@
 #include "settings.h"
 
 #include <glib/gprintf.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #ifndef _
 # include <libintl.h>
diff --git a/panel-plugin/settings.c b/panel-plugin/settings.c
index dcc474e..c0f1fed 100644
--- a/panel-plugin/settings.c
+++ b/panel-plugin/settings.c
@@ -22,7 +22,7 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "settings.h"
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 static void default_command( const gchar ** command, gboolean * in_terminal, gboolean * startup_notification )
 {
-- 
1.7.3.1