Index: plugins/systray/systray.c =================================================================== --- plugins/systray/systray.c (revision 19959) +++ plugins/systray/systray.c (working copy) @@ -141,34 +141,23 @@ /* Interface Implementation */ static void -systray_orientation_changed (XfcePanelPlugin *plugin, +systray_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation, Systray *systray) { - systray_stop (systray); - - gtk_widget_destroy (systray->iconbox); + xfce_hvbox_set_orientation ( XFCE_HVBOX (systray->iconbox), orientation); if (orientation == GTK_ORIENTATION_HORIZONTAL) { - systray->iconbox = gtk_hbox_new (TRUE, 3); - gtk_alignment_set_padding (GTK_ALIGNMENT (systray->align), 0, 0, 3, 3); } else { - systray->iconbox = gtk_vbox_new (TRUE, 3); - gtk_alignment_set_padding (GTK_ALIGNMENT (systray->align), 3, 3, 0, 0); } - - gtk_widget_show (systray->iconbox); - gtk_container_add (GTK_CONTAINER (systray->align), systray->iconbox); - - systray_start (systray); } static gboolean @@ -260,7 +249,7 @@ Systray *systray = g_new0 (Systray, 1); g_signal_connect (plugin, "orientation-changed", - G_CALLBACK (systray_orientation_changed), systray); + G_CALLBACK (systray_set_orientation), systray); g_signal_connect (plugin, "size-changed", G_CALLBACK (systray_set_size), systray); @@ -290,21 +279,8 @@ gtk_widget_show (systray->align); gtk_container_add (GTK_CONTAINER (systray->frame), systray->align); - if (xfce_panel_plugin_get_orientation (plugin) == - GTK_ORIENTATION_HORIZONTAL) - { - systray->iconbox = gtk_hbox_new (TRUE, 3); - - gtk_alignment_set_padding (GTK_ALIGNMENT (systray->align), - 0, 0, 3, 3); - } - else - { - systray->iconbox = gtk_vbox_new (TRUE, 3); - - gtk_alignment_set_padding (GTK_ALIGNMENT (systray->align), - 3, 3, 0, 0); - } + systray->iconbox = xfce_hvbox_new (); + systray_set_orientation(plugin, xfce_panel_plugin_get_orientation (plugin), systray); gtk_widget_show (systray->iconbox); gtk_container_add (GTK_CONTAINER (systray->align), systray->iconbox); Index: configure.ac =================================================================== --- configure.ac (revision 19959) +++ configure.ac (working copy) @@ -58,7 +58,7 @@ dnl Check for required packages dnl XDT_CHECK_PACKAGE([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [4.2.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.0]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.6]) +XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.9]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) dnl Check for optional packages