[Xfce4-commits] <xfce4-panel:nick/gtk3> Remove the XfceHvBox.

Nick Schermer noreply at xfce.org
Sun Mar 17 13:38:04 CET 2013


Updating branch refs/heads/nick/gtk3
         to 4bc82a149c8adb6de61f0e9b76e8a684c6fbd7da (commit)
       from 5241c9a488b94b4a3f9bfa734c4229037a0f51b3 (commit)

commit 4bc82a149c8adb6de61f0e9b76e8a684c6fbd7da
Author: Nick Schermer <nick at xfce.org>
Date:   Sun May 6 13:20:32 2012 +0200

    Remove the XfceHvBox.
    
    GtkBox is capable of all this and was internally already used.

 docs/references/libxfce4panel-docs.xml      |    1 -
 docs/references/libxfce4panel-sections.txt  |   18 --
 docs/references/libxfce4panel.types         |    1 -
 libxfce4panel/Makefile.am                   |    2 -
 libxfce4panel/libxfce4panel.h               |    1 -
 libxfce4panel/libxfce4panel.symbols         |   10 -
 libxfce4panel/xfce-hvbox.c                  |  306 ---------------------------
 libxfce4panel/xfce-hvbox.h                  |   77 -------
 libxfce4panel/xfce-panel-plugin.c           |    4 -
 plugins/actions/actions.c                   |    2 +-
 plugins/applicationsmenu/applicationsmenu.c |    2 +-
 plugins/launcher/launcher.c                 |    6 +-
 plugins/systray/systray.c                   |    4 +-
 plugins/tasklist/tasklist-widget.c          |    6 +-
 plugins/tasklist/tasklist.c                 |    2 +-
 po/POTFILES.in                              |    1 -
 16 files changed, 11 insertions(+), 432 deletions(-)

diff --git a/docs/references/libxfce4panel-docs.xml b/docs/references/libxfce4panel-docs.xml
index 16ff243..c6cec30 100644
--- a/docs/references/libxfce4panel-docs.xml
+++ b/docs/references/libxfce4panel-docs.xml
@@ -146,7 +146,6 @@
     <para>This section describes the additional widgets provided by the <application>xfce4-panel</application> library.</para>
 
     <xi:include href="xml/xfce-arrow-button.xml"/>
-    <xi:include href="xml/xfce-hvbox.xml"/>
     <xi:include href="xml/xfce-panel-image.xml"/>
   </part>
 
diff --git a/docs/references/libxfce4panel-sections.txt b/docs/references/libxfce4panel-sections.txt
index f58be39..2bfc3fa 100644
--- a/docs/references/libxfce4panel-sections.txt
+++ b/docs/references/libxfce4panel-sections.txt
@@ -34,24 +34,6 @@ xfce_arrow_button_get_type
 </SECTION>
 
 <SECTION>
-<FILE>xfce-hvbox</FILE>
-XfceHVBox
-xfce_hvbox_new
-xfce_hvbox_set_orientation
-xfce_hvbox_get_orientation
-<SUBSECTION Standard>
-XfceHVBoxClass
-XFCE_TYPE_HVBOX
-XFCE_HVBOX
-XFCE_HVBOX_CLASS
-XFCE_IS_HVBOX
-XFCE_IS_HVBOX_CLASS
-XFCE_HVBOX_GET_CLASS
-<SUBSECTION Private>
-xfce_hvbox_get_type
-</SECTION>
-
-<SECTION>
 <FILE>convenience</FILE>
 xfce_panel_create_button
 xfce_panel_create_toggle_button
diff --git a/docs/references/libxfce4panel.types b/docs/references/libxfce4panel.types
index bfdbd2f..c676220 100644
--- a/docs/references/libxfce4panel.types
+++ b/docs/references/libxfce4panel.types
@@ -1,6 +1,5 @@
 #include <libxfce4panel/libxfce4panel.h>
 
 xfce_arrow_button_get_type
-xfce_hvbox_get_type
 xfce_panel_image_get_type
 xfce_panel_plugin_get_type
diff --git a/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am
index cba5083..0da0b1d 100644
--- a/libxfce4panel/Makefile.am
+++ b/libxfce4panel/Makefile.am
@@ -25,7 +25,6 @@ libxfce4panel_headers = \
 	libxfce4panel-config.h \
 	libxfce4panel-enums.h \
 	xfce-arrow-button.h \
-	xfce-hvbox.h \
 	xfce-panel-convenience.h \
 	xfce-panel-macros.h \
 	xfce-panel-macros-46.h \
@@ -45,7 +44,6 @@ libxfce4panel_1_0_la_SOURCES = \
 	$(libxfce4panel_headers) \
 	libxfce4panel-config.c \
 	xfce-arrow-button.c \
-	xfce-hvbox.c \
 	xfce-panel-convenience.c \
 	xfce-panel-plugin.c \
 	xfce-panel-plugin-provider.c \
diff --git a/libxfce4panel/libxfce4panel.h b/libxfce4panel/libxfce4panel.h
index 5db33c3..a64907b 100644
--- a/libxfce4panel/libxfce4panel.h
+++ b/libxfce4panel/libxfce4panel.h
@@ -29,7 +29,6 @@ G_BEGIN_DECLS
 #include <libxfce4panel/xfce-panel-macros.h>
 #include <libxfce4panel/xfce-panel-macros-46.h>
 #include <libxfce4panel/xfce-arrow-button.h>
-#include <libxfce4panel/xfce-hvbox.h>
 #include <libxfce4panel/xfce-panel-convenience.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 #include <libxfce4panel/xfce-panel-image.h>
diff --git a/libxfce4panel/libxfce4panel.symbols b/libxfce4panel/libxfce4panel.symbols
index 34f1f97..0e45685 100644
--- a/libxfce4panel/libxfce4panel.symbols
+++ b/libxfce4panel/libxfce4panel.symbols
@@ -61,16 +61,6 @@ xfce_arrow_button_set_blinking
 #endif
 #endif
 
-/* xfce-hvbox.h */
-#if IN_HEADER(__XFCE_HVBOX_H__)
-#if IN_SOURCE(__XFCE_HVBOX_C__)
-xfce_hvbox_get_type G_GNUC_CONST
-xfce_hvbox_new G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
-xfce_hvbox_set_orientation
-xfce_hvbox_get_orientation
-#endif
-#endif
-
 /* xfce-panel-convenience.h */
 #if IN_HEADER(__XFCE_PANEL_CONVENIENCE_H__)
 #if IN_SOURCE(__XFCE_PANEL_CONVENIENCE_C__)
diff --git a/libxfce4panel/xfce-hvbox.c b/libxfce4panel/xfce-hvbox.c
deleted file mode 100644
index 33f482b..0000000
--- a/libxfce4panel/xfce-hvbox.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * This file is partly based on OBox
- * Copyright (C) 2002      Red Hat Inc. based on GtkHBox
- *
- * Copyright (C) 2006-2007 Jasper Huijsmans <jasper at xfce.org>
- * Copyright (C) 2006      Jani Monoses <jani at ubuntu.com>
- * Copyright (C) 2007-2010 Nick Schermer <nick at xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-
-#include <libxfce4panel/xfce-panel-macros.h>
-#include <libxfce4panel/xfce-hvbox.h>
-#include <libxfce4panel/libxfce4panel-alias.h>
-
-
-
-/**
- * SECTION: xfce-hvbox
- * @title: XfceHVBox
- * @short_description: Container widget with configurable orientation
- * @include: libxfce4panel/libxfce4panel.h
- *
- * #XfceHVBox is a #GtkBox widget that allows the user to change
- * its orientation. It is in fact a combination of #GtkHBox and #GtkVBox.
- *
- * If your code depends on Gtk+ 2.16 or later, if it better to use
- * the normal #GtkBox widgets in combination with
- * gtk_orientable_set_orientation().
- *
- * See also: #GtkOrientable and #GtkBox.
- **/
-
-
-
-#if !GTK_CHECK_VERSION (2, 16, 0)
-enum
-{
-  PROP_0,
-  PROP_ORIENTATION
-};
-
-static void      xfce_hvbox_get_property (GObject        *object,
-                                          guint           prop_id,
-                                          GValue         *value,
-                                          GParamSpec     *pspec);
-static void      xfce_hvbox_set_property (GObject        *object,
-                                          guint           prop_id,
-                                          const GValue   *value,
-                                          GParamSpec     *pspec);
-static gpointer xfce_hvbox_get_class     (XfceHVBox      *hvbox);
-static void     xfce_hvbox_size_request  (GtkWidget      *widget,
-                                          GtkRequisition *requisition);
-static void     xfce_hvbox_size_allocate (GtkWidget      *widget,
-                                          GtkAllocation  *allocation);
-#endif
-
-
-
-G_DEFINE_TYPE (XfceHVBox, xfce_hvbox, GTK_TYPE_BOX)
-
-
-
-static void
-xfce_hvbox_class_init (XfceHVBoxClass *klass)
-{
-#if !GTK_CHECK_VERSION (2, 16, 0)
-  GObjectClass   *gobject_class;
-  GtkWidgetClass *gtkwidget_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->get_property = xfce_hvbox_get_property;
-  gobject_class->set_property = xfce_hvbox_set_property;
-
-  gtkwidget_class = GTK_WIDGET_CLASS (klass);
-  gtkwidget_class->size_request  = xfce_hvbox_size_request;
-  gtkwidget_class->size_allocate = xfce_hvbox_size_allocate;
-
-  /**
-   * XfceHVBox:orientation:
-   *
-   * The orientation of the #XfceHVBox. When compiled with Gtk+ 2.16,
-   * this is the orientation property of the #GtkOrientable.
-   **/
-  g_object_class_install_property (gobject_class,
-                                   PROP_ORIENTATION,
-                                   g_param_spec_enum ("orientation",
-                                                      "Orientation",
-                                                      "Orientation of the box",
-                                                      GTK_TYPE_ORIENTATION,
-                                                      GTK_ORIENTATION_HORIZONTAL,
-                                                      G_PARAM_READWRITE
-                                                      | G_PARAM_STATIC_STRINGS));
-#endif
-}
-
-
-
-static void
-xfce_hvbox_init (XfceHVBox *hvbox)
-{
-  /* initialize variables */
-  hvbox->orientation = GTK_ORIENTATION_HORIZONTAL;
-}
-
-
-
-#if !GTK_CHECK_VERSION (2, 16, 0)
-static void
-xfce_hvbox_get_property (GObject    *object,
-                         guint       prop_id,
-                         GValue     *value,
-                         GParamSpec *pspec)
-{
-  XfceHVBox *hvbox = XFCE_HVBOX (object);
-
-  switch (prop_id)
-    {
-    case PROP_ORIENTATION:
-      g_value_set_enum (value, hvbox->orientation);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-
-
-static void
-xfce_hvbox_set_property (GObject      *object,
-                         guint         prop_id,
-                         const GValue *value,
-                         GParamSpec   *pspec)
-{
-  XfceHVBox *hvbox = XFCE_HVBOX (object);
-
-  switch (prop_id)
-    {
-    case PROP_ORIENTATION:
-      xfce_hvbox_set_orientation (hvbox, g_value_get_enum (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-
-
-static gpointer
-xfce_hvbox_get_class (XfceHVBox *hvbox)
-{
-  GType    type;
-  gpointer klass;
-
-  if (hvbox->orientation == GTK_ORIENTATION_HORIZONTAL)
-    type = GTK_TYPE_HBOX;
-  else
-    type = GTK_TYPE_VBOX;
-
-  /* peek the class, this only works if the class already exists */
-  klass = g_type_class_peek (type);
-
-  /* return the type or create the class */
-  return klass ? klass : g_type_class_ref (type);
-}
-
-
-
-static void
-xfce_hvbox_size_request (GtkWidget      *widget,
-                         GtkRequisition *requisition)
-{
-  gpointer klass;
-
-  /* get the widget class */
-  klass = xfce_hvbox_get_class (XFCE_HVBOX (widget));
-
-  /* request the size */
-  (*GTK_WIDGET_CLASS (klass)->size_request) (widget, requisition);
-}
-
-
-
-static void
-xfce_hvbox_size_allocate (GtkWidget     *widget,
-                          GtkAllocation *allocation)
-{
-  gpointer klass;
-
-  /* get the widget class */
-  klass = xfce_hvbox_get_class (XFCE_HVBOX (widget));
-
-  /* allocate the size */
-  (*GTK_WIDGET_CLASS (klass)->size_allocate) (widget, allocation);
-}
-#endif
-
-
-
-/**
- * xfce_hvbox_new:
- * @orientation : Orientation of the #XfceHVBox
- * @homogeneous : whether all children should be allocated the same size
- * @spacing     : spacing between #XfceHVBox children
- *
- * Creates a new #XfceHVBox container widget.
- *
- * Returns: the newly allocated #XfceHVBox container widget.
- **/
-GtkWidget *
-xfce_hvbox_new (GtkOrientation orientation,
-                gboolean       homogeneous,
-                gint           spacing)
-{
-  XfceHVBox *box;
-
-  /* create new object */
-  box = g_object_new (XFCE_TYPE_HVBOX,
-#if GTK_CHECK_VERSION (2, 16, 0)
-                      "orientation", orientation,
-#endif
-                      "homogeneous", homogeneous,
-                      "spacing", spacing, NULL);
-
-  /* store the orientation */
-  box->orientation = orientation;
-
-  return GTK_WIDGET (box);
-}
-
-
-
-/**
- * xfce_hvbox_set_orientation:
- * @hvbox       : #XfceHVBox
- * @orientation : the new orientation of the #XfceHVBox
- *
- * Set the new orientation of the #XfceHVBox container widget.
- **/
-void
-xfce_hvbox_set_orientation (XfceHVBox      *hvbox,
-                            GtkOrientation  orientation)
-{
-  g_return_if_fail (XFCE_IS_HVBOX (hvbox));
-
-  if (G_LIKELY (hvbox->orientation != orientation))
-    {
-      /* store new orientation */
-      hvbox->orientation = orientation;
-
-#if GTK_CHECK_VERSION (2, 16, 0)
-      gtk_orientable_set_orientation (GTK_ORIENTABLE (hvbox), orientation);
-#else
-      gtk_widget_queue_resize (GTK_WIDGET (hvbox));
-#endif
-    }
-}
-
-
-
-/**
- * xfce_hvbox_get_orientation:
- * @hvbox       : #XfceHVBox
- *
- * Get the current orientation of the @hvbox.
- *
- * Returns: the current orientation of the #XfceHVBox.
- **/
-GtkOrientation
-xfce_hvbox_get_orientation (XfceHVBox *hvbox)
-{
-  g_return_val_if_fail (XFCE_IS_HVBOX (hvbox), GTK_ORIENTATION_HORIZONTAL);
-
-#if GTK_CHECK_VERSION (2, 16, 0)
-  return gtk_orientable_get_orientation (GTK_ORIENTABLE (hvbox));
-#else
-  return hvbox->orientation;
-#endif
-}
-
-
-
-#define __XFCE_HVBOX_C__
-#include <libxfce4panel/libxfce4panel-aliasdef.c>
diff --git a/libxfce4panel/xfce-hvbox.h b/libxfce4panel/xfce-hvbox.h
deleted file mode 100644
index f3b464c..0000000
--- a/libxfce4panel/xfce-hvbox.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * This file is partly based on OBox
- * Copyright (C) 2002      Red Hat Inc. based on GtkHBox
- *
- * Copyright (C) 2006-2007 Jasper Huijsmans <jasper at xfce.org>
- * Copyright (C) 2006      Jani Monoses <jani at ubuntu.com>
- * Copyright (C) 2007-2010 Nick Schermer <nick at xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/* #if !defined(LIBXFCE4PANEL_INSIDE_LIBXFCE4PANEL_H) && !defined(LIBXFCE4PANEL_COMPILATION)
-#error "Only <libxfce4panel/libxfce4panel.h> can be included directly, this file may disappear or change contents"
-#endif */
-
-#ifndef __XFCE_HVBOX_H__
-#define __XFCE_HVBOX_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-typedef struct _XfceHVBoxClass XfceHVBoxClass;
-typedef struct _XfceHVBox      XfceHVBox;
-
-#define XFCE_TYPE_HVBOX            (xfce_hvbox_get_type())
-#define XFCE_HVBOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST (obj, XFCE_TYPE_HVBOX, XfceHVBox))
-#define XFCE_HVBOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST (klass, XFCE_TYPE_HVBOX, XfceHVBoxClass))
-#define XFCE_IS_HVBOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, XFCE_TYPE_HVBOX))
-#define XFCE_IS_HVBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_HVBOX))
-#define XFCE_HVBOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_HVBOX, XfceHVBoxClass))
-
-struct _XfceHVBoxClass
-{
-  /*< private >*/
-  GtkBoxClass __parent__;
-};
-
-/**
- * XfceHVBox:
- *
- * This struct contain private data only and should be accessed by
- * the functions below.
- **/
-struct _XfceHVBox
-{
-  /*< private >*/
-  GtkBox __parent__;
-
-  GtkOrientation orientation;
-};
-
-GType           xfce_hvbox_get_type         (void) G_GNUC_CONST;
-
-GtkWidget      *xfce_hvbox_new              (GtkOrientation  orientation,
-                                             gboolean        homogeneous,
-                                             gint            spacing) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-void            xfce_hvbox_set_orientation  (XfceHVBox      *hvbox,
-                                             GtkOrientation  orientation);
-GtkOrientation  xfce_hvbox_get_orientation  (XfceHVBox      *hvbox);
-
-G_END_DECLS
-
-#endif /* !__XFCE_HVBOX_H__ */
diff --git a/libxfce4panel/xfce-panel-plugin.c b/libxfce4panel/xfce-panel-plugin.c
index 8126922..c91039f 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -274,8 +274,6 @@ xfce_panel_plugin_class_init (XfcePanelPluginClass *klass)
    *
    * This signal is emmitted when the plugin is closing. Plugin
    * writers should use this signal to free any allocated resources.
-   *
-   * See also #XfceHVBox.
    **/
   plugin_signals[FREE_DATA] =
     g_signal_new (g_intern_static_string ("free-data"),
@@ -294,8 +292,6 @@ xfce_panel_plugin_class_init (XfcePanelPluginClass *klass)
    * This signal is emmitted whenever the orientation of the panel
    * the @plugin is on changes. Plugins writers can for example use
    * this signal to change the order of widgets in the plugin.
-   *
-   * See also: #XfceHVBox.
    **/
   plugin_signals[ORIENTATION_CHANGED] =
     g_signal_new (g_intern_static_string ("orientation-changed"),
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index 72fb9b4..5b6c017 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -1103,7 +1103,7 @@ actions_plugin_pack_idle (gpointer data)
     {
       if (plugin->invert_orientation)
         orientation = !orientation;
-      box = xfce_hvbox_new (orientation, FALSE, 0);
+      box = gtk_box_new (orientation, 0);
       gtk_container_add (GTK_CONTAINER (plugin), box);
       gtk_widget_show (box);
 
diff --git a/plugins/applicationsmenu/applicationsmenu.c b/plugins/applicationsmenu/applicationsmenu.c
index 103be00..cd50549 100644
--- a/plugins/applicationsmenu/applicationsmenu.c
+++ b/plugins/applicationsmenu/applicationsmenu.c
@@ -236,7 +236,7 @@ applications_menu_plugin_init (ApplicationsMenuPlugin *plugin)
   g_signal_connect (G_OBJECT (plugin->button), "button-press-event",
       G_CALLBACK (applications_menu_plugin_menu), plugin);
 
-  plugin->box = xfce_hvbox_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 1);
+  plugin->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
   gtk_container_add (GTK_CONTAINER (plugin->button), plugin->box);
   gtk_widget_show (plugin->box);
 
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 470eedb..298a335 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -359,7 +359,7 @@ launcher_plugin_init (LauncherPlugin *plugin)
       G_CALLBACK (launcher_plugin_icon_theme_changed), plugin);
 
   /* create the panel widgets */
-  plugin->box = xfce_hvbox_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
+  plugin->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (plugin), plugin->box);
 
   plugin->button = xfce_panel_create_button ();
@@ -1404,8 +1404,8 @@ launcher_plugin_pack_widgets (LauncherPlugin *plugin)
   gtk_box_reorder_child (GTK_BOX (plugin->box), plugin->arrow,
       (pos == LAUNCHER_ARROW_WEST || pos == LAUNCHER_ARROW_NORTH) ? 0 : -1);
 
-  /* set the orientation of the hvbox */
-  xfce_hvbox_set_orientation (XFCE_HVBOX (plugin->box),
+  /* set the orientation */
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (plugin->box),
       !!(pos == LAUNCHER_ARROW_WEST || pos == LAUNCHER_ARROW_EAST) ?
           GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
 }
diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
index 6d21ae9..2095bc0 100644
--- a/plugins/systray/systray.c
+++ b/plugins/systray/systray.c
@@ -227,7 +227,7 @@ systray_plugin_init (SystrayPlugin *plugin)
   gtk_widget_modify_style (plugin->frame, style);
   g_object_unref (G_OBJECT (style));
 
-  plugin->hvbox = xfce_hvbox_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2);
+  plugin->hvbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_container_add (GTK_CONTAINER (plugin->frame), plugin->hvbox);
   gtk_widget_show (plugin->hvbox);
 
@@ -506,7 +506,7 @@ systray_plugin_orientation_changed (XfcePanelPlugin *panel_plugin,
 {
   SystrayPlugin *plugin = XFCE_SYSTRAY_PLUGIN (panel_plugin);
 
-  xfce_hvbox_set_orientation (XFCE_HVBOX (plugin->hvbox), orientation);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (plugin->hvbox), orientation);
   systray_box_set_orientation (XFCE_SYSTRAY_BOX (plugin->box), orientation);
 
   if (G_LIKELY (plugin->manager != NULL))
diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
index 767517f..65420c0 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -2042,8 +2042,8 @@ xfce_tasklist_child_new (XfceTasklist *tasklist)
   gtk_button_set_relief (GTK_BUTTON (child->button),
                          tasklist->button_relief);
 
-  child->box = xfce_hvbox_new (!xfce_tasklist_vertical (tasklist) ?
-      GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL, FALSE, 6);
+  child->box = gtk_box_new (!xfce_tasklist_vertical (tasklist) ?
+      GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (child->button), child->box);
   gtk_widget_show (child->box);
 
@@ -3846,7 +3846,7 @@ xfce_tasklist_update_orientation (XfceTasklist *tasklist)
       child = li->data;
 
       /* update task box */
-      xfce_hvbox_set_orientation (XFCE_HVBOX (child->box),
+      gtk_orientable_set_orientation (GTK_ORIENTABLE (child->box),
           horizontal ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
 
       /* update the label */
diff --git a/plugins/tasklist/tasklist.c b/plugins/tasklist/tasklist.c
index a00d985..b1e59b7 100644
--- a/plugins/tasklist/tasklist.c
+++ b/plugins/tasklist/tasklist.c
@@ -101,7 +101,7 @@ tasklist_plugin_init (TasklistPlugin *plugin)
   GtkWidget *box;
 
   /* create widgets */
-  box = xfce_hvbox_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (plugin), box);
   g_object_bind_property (G_OBJECT (plugin), "orientation",
                           G_OBJECT (box), "orientation",
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 71566bf..d2da4e4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,6 @@ panel-preferences.desktop.in
 common/panel-utils.c
 
 libxfce4panel/xfce-arrow-button.c
-libxfce4panel/xfce-hvbox.c
 libxfce4panel/xfce-panel-convenience.c
 libxfce4panel/xfce-panel-image.c
 libxfce4panel/xfce-panel-plugin-provider.c


More information about the Xfce4-commits mailing list