From 47ee4164011cad1ab97128a1382db2173e16a51f Mon Sep 17 00:00:00 2001 From: Christoph J. Thompson Date: Sun, 23 Jan 2011 17:43:34 +0100 Subject: [PATCH 1/2] Port to libxfce4ui. modified: configure.in.in modified: lib/Makefile.am modified: lib/libxfce4sensors-1.0.pc.in modified: lib/sensors-interface.c modified: panel-plugin/Makefile.am modified: panel-plugin/sensors-plugin.c modified: src/Makefile.am modified: src/actions.c modified: src/callbacks.c modified: src/interface.c --- configure.in.in | 2 +- lib/Makefile.am | 8 ++++---- lib/libxfce4sensors-1.0.pc.in | 2 +- lib/sensors-interface.c | 2 +- panel-plugin/Makefile.am | 4 ++-- panel-plugin/sensors-plugin.c | 14 +++++++++++--- src/Makefile.am | 4 ++-- src/actions.c | 2 +- src/callbacks.c | 2 +- src/interface.c | 2 +- 10 files changed, 25 insertions(+), 17 deletions(-) diff --git a/configure.in.in b/configure.in.in index 8cf0caf..d821d33 100644 --- a/configure.in.in +++ b/configure.in.in @@ -310,7 +310,7 @@ dnl ************************************** dnl *** Check for Xfce packages *** dnl ************************************** XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) dnl configure the panel plugin XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0]) diff --git a/lib/Makefile.am b/lib/Makefile.am index 7daad8a..f8f645f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -42,7 +42,7 @@ libxfce4sensors_la_CFLAGS = \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ @GTK_CFLAGS@ \ @GLIB_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ \ + @LIBXFCE4UI_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \ @LIBXFCE4PANEL_CFLAGS@ \ @LIBSENSORS_CFLAGS@ @@ -54,7 +54,7 @@ endif # @GTK_CFLAGS@ \ # @GLIB_CFLAGS@ \ # @LIBXFCE4UTIL_CFLAGS@ \ -# @LIBXFCEGUI4_CFLAGS@ +# @LIBXFCE4UI_CFLAGS@ libxfce4sensors_la_LDFLAGS = \ -export-dynamic \ @@ -71,7 +71,7 @@ libxfce4sensors_la_LIBADD = \ @GTK_LIBS@ \ @GLIB_LIBS@ \ @LIBXFCE4UTIL_LIBS@ \ - @LIBXFCEGUI4_LIBS@ \ + @LIBXFCE4UI_LIBS@ \ @LIBXFCE4PANEL_LIBS@ \ @LIBSENSORS_LDFLAGS@ \ @LIBM@ @@ -83,7 +83,7 @@ endif # @GTK_LIBS@ \ # @GLIB_LIBS@ \ # @LIBXFCE4UTIL_LIBS@ \ -# @LIBXFCEGUI4_LIBS@ +# @LIBXFCE4UI_LIBS@ #@SOLLIBS@ diff --git a/lib/libxfce4sensors-1.0.pc.in b/lib/libxfce4sensors-1.0.pc.in index 8be3b1a..746329b 100644 --- a/lib/libxfce4sensors-1.0.pc.in +++ b/lib/libxfce4sensors-1.0.pc.in @@ -8,7 +8,7 @@ localedir=@localedir@ Name: libxfce4sensors Description: Library for the Xfce 4 Sensors Plugin and Viewer -Requires: libxfce4util-1.0 libxfcegui4-1.0 +Requires: libxfce4util-1.0 libxfce4ui-1 Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lxfce4sensors Cflags: -I${includedir}/xfce4/ diff --git a/lib/sensors-interface.c b/lib/sensors-interface.c index 6f32e87..29e3ca9 100644 --- a/lib/sensors-interface.c +++ b/lib/sensors-interface.c @@ -34,7 +34,7 @@ #include /* Xfce includes */ -#include +#include /* Package includes */ #include diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 9080b5d..fab88db 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -20,7 +20,7 @@ xfce4_sensors_plugin_SOURCES = \ xfce4_sensors_plugin_CFLAGS = \ @LIBXFCE4PANEL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ \ + @LIBXFCE4UI_CFLAGS@ \ @PLATFORM_CFLAGS@ \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ @LIBSENSORS_CFLAGS@ @@ -32,7 +32,7 @@ xfce4_sensors_plugin_CFLAGS = \ xfce4_sensors_plugin_LDADD = \ $(top_builddir)/lib/libxfce4sensors.la \ @LIBXFCE4PANEL_LIBS@ \ - @LIBXFCEGUI4_LIBS@ \ + @LIBXFCE4UI_LIBS@ \ @SOLLIBS@ \ @LIBSENSORS_LDFLAGS@ \ @LIBM@ diff --git a/panel-plugin/sensors-plugin.c b/panel-plugin/sensors-plugin.c index 519d0f4..5ab8188 100644 --- a/panel-plugin/sensors-plugin.c +++ b/panel-plugin/sensors-plugin.c @@ -40,7 +40,7 @@ /* Xfce includes */ #include -#include +#include #include /* Package includes */ @@ -1010,6 +1010,7 @@ static gboolean execute_command (GtkWidget *widget, GdkEventButton *event, gpointer data) { t_sensors *sensors; + GError *error = NULL; TRACE ("enters execute_command"); @@ -1021,9 +1022,16 @@ execute_command (GtkWidget *widget, GdkEventButton *event, gpointer data) g_return_val_if_fail ( sensors->exec_command, FALSE); - xfce_exec (sensors->command_name, FALSE, FALSE, NULL); + gchar **command = g_strsplit(sensors->command_name, " ", 0); - TRACE ("leaves execute_command with TRUE"); + if(!xfce_spawn_on_screen (NULL, NULL, command, NULL, 0, FALSE, 0, NULL, &error)) + { + g_warning ("%s", error->message); + } + + g_strfreev (command); + + TRACE ("leaves execute_command with TRUE"); return TRUE; } diff --git a/src/Makefile.am b/src/Makefile.am index 387e63c..6e88b51 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ xfce4_sensors_CFLAGS = \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ @LIBSENSORS_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ \ + @LIBXFCE4UI_CFLAGS@ \ @LIBXFCE4PANEL_CFLAGS@ # @GTK_CFLAGS@ \ @@ -42,7 +42,7 @@ xfce4_sensors_LDADD = \ $(top_builddir)/lib/libxfce4sensors.la \ @LIBSENSORS_LDFLAGS@ \ @LIBXFCE4UTIL_LIBS@ \ - @LIBXFCEGUI4_LIBS@ \ + @LIBXFCE4UI_LIBS@ \ @LIBM@ # @GTK_LIBS@ \ diff --git a/src/actions.c b/src/actions.c index 600a70e..fc99783 100644 --- a/src/actions.c +++ b/src/actions.c @@ -28,7 +28,7 @@ #include /* Xfce includes */ -#include +#include /* Package includes */ #include diff --git a/src/callbacks.c b/src/callbacks.c index fa87b39..55711af 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -27,7 +27,7 @@ #include /* Xfce includes */ -#include +#include /* Package includes */ #include diff --git a/src/interface.c b/src/interface.c index a81bef7..0492950 100644 --- a/src/interface.c +++ b/src/interface.c @@ -24,7 +24,7 @@ #endif /* Xfce includes */ -#include +#include /* Package includes */ #include -- 1.7.1