[Xfce4-commits] <midori:master> Guard transferbar packing against GTK+3

[Christian Dywan]

Updating branch refs/heads/master
         to 6c57f7db429ab86b9ad27866678226d33532ee03 (commit)
       from 537d002a6f939d262aa58dc7659f5a0aa00979b0 (commit)

commit 6c57f7db429ab86b9ad27866678226d33532ee03
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Mar 8 00:50:59 2012 +0100

    Guard transferbar packing against GTK+3

 midori/midori-browser.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 534c5d4..d21cb04 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -6232,7 +6232,12 @@ midori_browser_init (MidoriBrowser* browser)
     gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0);
 
     browser->transferbar = g_object_new (MIDORI_TYPE_TRANSFERBAR, NULL);
+    #if GTK_CHECK_VERSION (3, 0, 0)
+    /* FIXME: Transfers should go between text and statusbar features like GTK+2 */
     gtk_box_pack_end (GTK_BOX (browser->statusbar_contents), browser->transferbar, FALSE, FALSE, 3);
+    #else
+    gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), browser->transferbar, FALSE, FALSE, 3);
+    #endif
     gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->transferbar), FALSE);
     gtk_widget_show (browser->transferbar);