summaryrefslogtreecommitdiff
path: root/applets/notification_area/na-tray.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-23 09:52:59 +0100
committerinfirit <[email protected]>2014-11-23 09:52:59 +0100
commit175d93f66a33ff26159de004c92d26b9e15e5c67 (patch)
tree785d2780c9d67b8a4a7784ed0eafaa0e8b159d41 /applets/notification_area/na-tray.c
parentd87ffd3403e55087ee99a2c237d909503494dd6c (diff)
downloadmate-panel-175d93f66a33ff26159de004c92d26b9e15e5c67.tar.bz2
mate-panel-175d93f66a33ff26159de004c92d26b9e15e5c67.tar.xz
Gtk3: GtkBox is not abstract anymore.
Based on gnome-panel commits, na-tray: Remove unneeded type NaBox: 9313543ecf3f8de10cb14977cd2eccd17e654968 From: Carlos Garcia Campos <[email protected]> na: Move creating of GtkBox for NaTray: 777b913142e61378e60c217c7c609e181202704c From: Vincent Untz <[email protected]>
Diffstat (limited to 'applets/notification_area/na-tray.c')
-rw-r--r--applets/notification_area/na-tray.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/applets/notification_area/na-tray.c b/applets/notification_area/na-tray.c
index d2bcad3b..7df0741c 100644
--- a/applets/notification_area/na-tray.c
+++ b/applets/notification_area/na-tray.c
@@ -84,6 +84,7 @@ static TraysScreen *trays_screens = NULL;
static void icon_tip_show_next (IconTip *icontip);
+#if !GTK_CHECK_VERSION (3, 0, 0)
/* NaBox, an instantiable GtkBox */
typedef GtkBox NaBox;
@@ -102,6 +103,7 @@ static void
na_box_class_init (NaBoxClass *klass)
{
}
+#endif
/* NaTray */
@@ -604,15 +606,16 @@ na_tray_init (NaTray *tray)
gtk_container_add (GTK_CONTAINER (tray), priv->frame);
gtk_widget_show (priv->frame);
- priv->box = g_object_new (na_box_get_type (), NULL);
#if GTK_CHECK_VERSION (3, 0, 0)
+ priv->box = gtk_box_new (priv->orientation, ICON_SPACING);
g_signal_connect (priv->box, "draw",
G_CALLBACK (na_tray_draw_box), NULL);
#else
+ priv->box = g_object_new (na_box_get_type (), NULL);
g_signal_connect (priv->box, "expose-event",
G_CALLBACK (na_tray_expose_box), tray);
-#endif
gtk_box_set_spacing (GTK_BOX (priv->box), ICON_SPACING);
+#endif
gtk_container_add (GTK_CONTAINER (priv->frame), priv->box);
gtk_widget_show (priv->box);
}