[Xfce4-commits] <xfce4-wavelan-plugin:master> Port to libxfce4ui.

[Landry Breuil]

Updating branch refs/heads/master
         to c9800f4cccddbcf4eddcd3d169b7edf094adceca (commit)
       from a09c2c7629f6f0c1f2f77dff82cf4275c0438988 (commit)

commit c9800f4cccddbcf4eddcd3d169b7edf094adceca
Author: Landry Breuil <landry at xfce.org>
Date:   Tue Apr 3 18:34:56 2012 +0200

    Port to libxfce4ui.

 configure.ac.in          |    5 ++---
 panel-plugin/Makefile.am |    4 ++--
 panel-plugin/wavelan.c   |   11 ++---------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 4650138..63c65e0 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -47,9 +47,8 @@ XDT_I18N([@LINGUAS@])
 
 dnl configure the panel plugin
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.20])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
 
 dnl Check for debugging support
 BM_DEBUG_SUPPORT()
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 8f21b5f..00fcdab 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -11,7 +11,7 @@ plugin_PROGRAMS = xfce4-wavelan-plugin
 xfce4_wavelan_plugin_LDADD =							\
 				$(LIBM)						\
 				@LIBXFCE4PANEL_LIBS@				\
-				@LIBXFCEGUI4_LIBS@
+				@LIBXFCE4UI_LIBS@
 
 xfce4_wavelan_plugin_SOURCES =							\
 	wavelan.c							\
@@ -22,7 +22,7 @@ xfce4_wavelan_plugin_SOURCES =							\
 
 xfce4_wavelan_plugin_CFLAGS =							\
 	@LIBXFCE4PANEL_CFLAGS@							\
-	@LIBXFCEGUI4_CFLAGS@
+	@LIBXFCE4UI_CFLAGS@
 
 # .desktop file
 #
diff --git a/panel-plugin/wavelan.c b/panel-plugin/wavelan.c
index 5838024..6182fcb 100644
--- a/panel-plugin/wavelan.c
+++ b/panel-plugin/wavelan.c
@@ -31,10 +31,8 @@
 #include <gtk/gtk.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfce4panel/xfce-panel-convenience.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfce4panel/xfce-hvbox.h>
 
 #include "wi.h"
 
@@ -504,12 +502,7 @@ wavelan_create_options (XfcePanelPlugin *plugin, t_wavelan *wavelan)
   
   gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
 
-  header = xfce_create_header (NULL, _("Wavelan Plugin Options"));
-  gtk_widget_set_size_request (GTK_BIN (header)->child, 200, 32);
-  gtk_container_set_border_width (GTK_CONTAINER (header), 6);
-  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, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);