From: Christian Dywan <christian@twotoasts.de>
Date: Wed, 7 Mar 2012 23:50:59 +0000 (+0100)
Subject: Guard transferbar packing against GTK+3
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c57f7db429ab86b9ad27866678226d33532ee03;p=midori

Guard transferbar packing against GTK+3
---

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 534c5d48..d21cb04b 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);