panel-plugin: replace XFCE_HVBOX with new GtkBox API.

The XFCE_HVBOX stuff is gone in the new version of the panel library
because its functionality has been superseded by GtkBox in gtk+-3.x.
First we drop the header include for libxfce4panel/xfce-hvbox.h that no
longer exists, and then we change xfce_hvbox_new() to gtk_box_new() and
xfce_hvbox_set_orientation() to gtk_orientable_set_orientation().

diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c
index eb1d5cc81dcf7323c696fc3397473efb146f7657..e5a781e3b7cd50915f5a7136caeee63ad13d0c79 100644 (file)
--- a/panel-plugin/xfce4-hdaps.c
+++ b/panel-plugin/xfce4-hdaps.c
@@ -256,7 +256,7 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) {
 
   /* Set up the hvbox for the widget, which supports
      both horizontal and vertical (hv) orientations. */
-  hdaps->hvbox = xfce_hvbox_new(orientation, FALSE, 2);
+  hdaps->hvbox = gtk_box_new(orientation, 2);
   gtk_widget_show(hdaps->hvbox);
   gtk_container_add(GTK_CONTAINER(hdaps->eventbox), hdaps->hvbox);
 
@@ -310,7 +310,7 @@ static void hdaps_orientation_changed(XfcePanelPlugin *plugin,
                                      HdapsPlugin     *hdaps) {
   
   /* Change the plugin's orientation. Basically magic to me. */
-  xfce_hvbox_set_orientation(XFCE_HVBOX(hdaps->hvbox), orientation);
+  gtk_orientable_set_orientation(GTK_ORIENTABLE(hdaps->hvbox), orientation);
 }
 
 

diff --git a/panel-plugin/xfce4-hdaps.h b/panel-plugin/xfce4-hdaps.h
index 4affb309e64ac9b3e37c9b9ff48906d124606f03..9c1ac9c38578c8900f5b941dfb0da2623f507f9d 100644 (file)
--- a/panel-plugin/xfce4-hdaps.h
+++ b/panel-plugin/xfce4-hdaps.h
@@ -24,7 +24,6 @@
 
 #include <gtk/gtk.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfce4panel/xfce-hvbox.h>
 #include <libxfce4util/libxfce4util.h>
 
 G_BEGIN_DECLS