From: Michael Orlitzky Date: Wed, 23 Oct 2019 02:28:46 +0000 (-0400) Subject: panel-plugin: replace XFCE_HVBOX with new GtkBox API. X-Git-Tag: v1.0.0~22 X-Git-Url: http://gitweb.michael.orlitzky.com/?p=xfce4-hdaps.git;a=commitdiff_plain;h=c6fbeea01e8de4fedf99ea8f533991277d2c8eb7 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 eb1d5cc..e5a781e 100644 --- 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 4affb30..9c1ac9c 100644 --- a/panel-plugin/xfce4-hdaps.h +++ b/panel-plugin/xfce4-hdaps.h @@ -24,7 +24,6 @@ #include #include -#include #include G_BEGIN_DECLS