From ea8e4cfd9040c381a84165c975755c29ce2867d1 Mon Sep 17 00:00:00 2001
From: Mike Massonnet <mmassonnet@xfce.org>
Date: Sun, 13 Nov 2011 23:02:32 +0100
Subject: [PATCH] Port to libxfce4ui

---
 configure.ac.in          |    8 ++++----
 panel-plugin/Makefile.am |    4 ++--
 panel-plugin/fsguard.c   |   16 +++++++---------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index dd1dbdb..bf9ca15 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -43,10 +43,10 @@ dnl Check for X11 installed
 XDT_CHECK_LIBX11_REQUIRE
 
 dnl configure the panel plugin
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
 
 dnl check for i18n support
 XDT_I18N([@LINGUAS@])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index b7b8e7f..aaa648e 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -6,13 +6,13 @@ xfce4_fsguard_plugin_SOURCES =									\
 
 xfce4_fsguard_plugin_CFLAGS =									\
 	-I$(top_srcdir)												\
-	@LIBXFCEGUI4_CFLAGS@										\
+	@LIBXFCE4UI_CFLAGS@										\
 	@LIBXFCE4UTIL_CFLAGS@										\
 	@LIBXFCE4PANEL_CFLAGS@										\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
 xfce4_fsguard_plugin_LDADD =									\
-	@LIBXFCEGUI4_LIBS@											\
+	@LIBXFCE4UI_LIBS@											\
 	@LIBXFCE4UTIL_LIBS@											\
 	@LIBXFCE4PANEL_LIBS@
 
diff --git a/panel-plugin/fsguard.c b/panel-plugin/fsguard.c
index b4b7dbe..1c3421c 100644
--- a/panel-plugin/fsguard.c
+++ b/panel-plugin/fsguard.c
@@ -47,10 +47,8 @@
 
 #include <gtk/gtk.h>
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfce4panel/xfce-panel-convenience.h>
-#include <libxfce4panel/xfce-hvbox.h>
+#include <libxfce4ui/libxfce4ui.h>
+#include <libxfce4panel/libxfce4panel.h>
 
 #define ICON_NORMAL             0
 #define ICON_WARNING            1
@@ -218,7 +216,7 @@ __open_mnt (gchar *command, gchar *path)
     gchar *path_quoted;
     path_quoted = g_shell_quote (path);
     cmd = g_strdup_printf ("%s %s", command, path_quoted);
-    res = xfce_exec (cmd, FALSE, FALSE, NULL);
+    res = xfce_spawn_command_line_on_screen (NULL, cmd, FALSE, FALSE, NULL);
     g_free (path_quoted);
     g_free (cmd);
     return res;
@@ -308,10 +306,10 @@ fsguard_check_fs (FsGuard *fsguard)
     if (err != -1 && !fsguard->seen && icon_id == ICON_URGENT) {
         fsguard->seen = TRUE;
         if (*(fsguard->name) != '\0' && strcmp(fsguard->path, fsguard->name)) {
-            xfce_warn (_("Only %s space left on %s (%s)!"),
+            xfce_dialog_show_warning (NULL, NULL, _("Only %s space left on %s (%s)!"),
                        msg_size, fsguard->path, fsguard->name);
         } else {
-            xfce_warn (_("Only %s space left on %s!"),
+            xfce_dialog_show_warning (NULL, NULL, _("Only %s space left on %s!"),
                        msg_size, fsguard->path);
         }
     }
@@ -580,7 +578,7 @@ fsguard_create_options (XfcePanelPlugin *plugin, FsGuard *fsguard)
 
     /* Configuration frame */
     GtkWidget *table1 = gtk_table_new (2, 3, FALSE);
-    GtkWidget *frame1 = xfce_create_framebox_with_content (_("Configuration"), table1);
+    GtkWidget *frame1 = xfce_gtk_frame_box_new_with_content (_("Configuration"), table1);
     gtk_table_set_row_spacings (GTK_TABLE (table1), BORDER);
     gtk_table_set_col_spacings (GTK_TABLE (table1), BORDER);
     gtk_container_set_border_width (GTK_CONTAINER (frame1), BORDER);
@@ -618,7 +616,7 @@ fsguard_create_options (XfcePanelPlugin *plugin, FsGuard *fsguard)
 
     /* Display frame */
     GtkWidget *table2 = gtk_table_new (2, 4, FALSE);
-    GtkWidget *frame2 = xfce_create_framebox_with_content (_("User Interface"), table2);
+    GtkWidget *frame2 = xfce_gtk_frame_box_new_with_content (_("User Interface"), table2);
     gtk_table_set_row_spacings (GTK_TABLE (table2), BORDER);
     gtk_table_set_col_spacings (GTK_TABLE (table2), BORDER);
     gtk_container_set_border_width (GTK_CONTAINER (frame2), BORDER);
-- 
1.7.7