<xfce4-genmon-plugin:master> Port to libxfce4ui. Patch from Andreas Müller. Closes: #8406.

[John Lindgren]

Updating branch refs/heads/master
         to 84b188903d33db6e3f41b50cf8fb1d675c0882e7 (commit)
       from e82f2e07192fa2b4317f9f4a9523a26a9b71cfb6 (commit)

commit 84b188903d33db6e3f41b50cf8fb1d675c0882e7
Author: John Lindgren <john.lindgren at aol.com>
Date:   Mon Jan 30 15:48:36 2012 -0500

    Port to libxfce4ui.  Patch from Andreas Müller.  Closes: #8406.

 configure.ac.in           |    4 ++--
 panel-plugin/Makefile.am  |    4 ++--
 panel-plugin/cmdspawn.c   |    2 +-
 panel-plugin/config_gui.c |    2 +-
 panel-plugin/config_gui.h |    1 -
 panel-plugin/main.c       |   17 ++++++-----------
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index b9d5bd3..a04d0ec 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -31,8 +31,8 @@ dnl Check for standard header files
 AC_HEADER_STDC
 
 dnl configure the panel plugin
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
 
 dnl Translations
 XDT_I18N([@LINGUAS@])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 861a466..f819ff6 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -4,11 +4,11 @@ plugin_PROGRAMS = xfce4-genmon-plugin
 xfce4_genmon_plugin_CFLAGS =					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
 	@LIBXFCE4PANEL_CFLAGS@					\
-	@LIBXFCEGUI4_CFLAGS@
+	@LIBXFCE4UI_CFLAGS@
 
 xfce4_genmon_plugin_LDADD =					\
 	@LIBXFCE4PANEL_LIBS@					\
-	@LIBXFCEGUI4_LIBS@
+	@LIBXFCE4UI_LIBS@
 
 xfce4_genmon_plugin_SOURCES =	\
 	main.c			\
diff --git a/panel-plugin/cmdspawn.c b/panel-plugin/cmdspawn.c
index aef7689..ae9de82 100644
--- a/panel-plugin/cmdspawn.c
+++ b/panel-plugin/cmdspawn.c
@@ -49,7 +49,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <sys/wait.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 
 /**********************************************************************/
diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c
index 49ef267..3550c35 100644
--- a/panel-plugin/config_gui.c
+++ b/panel-plugin/config_gui.c
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/dialogs.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 
 
diff --git a/panel-plugin/config_gui.h b/panel-plugin/config_gui.h
index 84024b2..c6bb672 100644
--- a/panel-plugin/config_gui.h
+++ b/panel-plugin/config_gui.h
@@ -29,7 +29,6 @@
 #include <gtk/gtk.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/dialogs.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 
 
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index 1f741ee..4a15710 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -31,8 +31,7 @@
 #include <gtk/gtk.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/dialogs.h>
-#include <libxfcegui4/xfce-exec.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 #include <libxfce4panel/xfce-panel-convenience.h>
 
@@ -98,7 +97,7 @@ static void ExecOnClickCmd (Widget_t p_wSc, void *p_pvPlugin)
     struct monitor_t *poMonitor = &(poPlugin->oMonitor);
     GError *error = NULL;
 
-	xfce_exec(poMonitor->onClickCmd, 0, 0, &error);
+    xfce_spawn_command_line_on_screen( gdk_screen_get_default(), poMonitor->onClickCmd, 0, 0, &error );
     if (error) {
         char first[256];
         g_snprintf (first, sizeof(first), _("Could not run \"%s\""), poMonitor->onClickCmd);
@@ -592,7 +591,8 @@ static void UpdateConf (void *p_pvPlugin)
 static void About (Widget_t w, void *unused)
 /* Called back when the About button in clicked */
 {
-    xfce_info (_("%s %s - Generic Monitor\n"
+    xfce_dialog_show_info (NULL, NULL,
+        _("%s %s - Generic Monitor\n"
         "Cyclically spawns a script/program, captures its output "
         "and displays the resulting string in the panel\n\n"
         "(c) 2004 Roger Seguin <roger_seguin at msn.com>\n"
@@ -646,7 +646,7 @@ static void genmon_create_options (XfcePanelPlugin *plugin,
 /* Plugin API */
 /* Create/pop up the configuration/options GUI */
 {
-    GtkWidget *dlg, *header, *vbox;
+    GtkWidget *dlg, *vbox;
     struct param_t *poConf = &(poPlugin->oConf.oParam);
     struct gui_t   *poGUI = &(poPlugin->oConf.oGUI);
     const char     *pcFont = poConf->acFont;
@@ -667,12 +667,7 @@ static void genmon_create_options (XfcePanelPlugin *plugin,
 
     gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
 
-    header = xfce_create_header (NULL, _("Generic Monitor"));
-    gtk_widget_set_size_request (GTK_BIN (header)->child, -1, 32);
-    gtk_container_set_border_width (GTK_CONTAINER (header), BORDER - 2);
-    gtk_widget_show (header);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
-        FALSE, TRUE, 0);
+    xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Generic Monitor"));
 
     vbox = gtk_vbox_new(FALSE, BORDER);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER - 2);