[Xfce4-commits] <midori:master> Adjust guards in transferbar for WebKitGTK+ < 1.1.3

Christian Dywan noreply at xfce.org
Sun Jul 4 10:56:01 CEST 2010


Updating branch refs/heads/master
         to 9aebc6d37462f55c3a6380cb2e4cffa2f01e2834 (commit)
       from 67f4f7d9772914cc7868c20df1ca95d49c3273e9 (commit)

commit 9aebc6d37462f55c3a6380cb2e4cffa2f01e2834
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Jul 4 10:28:54 2010 +0200

    Adjust guards in transferbar for WebKitGTK+ < 1.1.3

 toolbars/midori-transferbar.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/toolbars/midori-transferbar.c b/toolbars/midori-transferbar.c
index f0fb030..f59d333 100644
--- a/toolbars/midori-transferbar.c
+++ b/toolbars/midori-transferbar.c
@@ -256,8 +256,10 @@ midori_transferbar_init (MidoriTransferbar* transferbar)
     transferbar->clear = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR);
     gtk_tool_button_set_label (GTK_TOOL_BUTTON (transferbar->clear), _("Clear All"));
     gtk_tool_item_set_is_important (transferbar->clear, TRUE);
+    #if WEBKIT_CHECK_VERSION (1, 1, 3)
     g_signal_connect (transferbar->clear, "clicked",
         G_CALLBACK (midori_transferbar_clear_clicked_cb), transferbar);
+    #endif
     gtk_toolbar_insert (GTK_TOOLBAR (transferbar), transferbar->clear, -1);
 
     transferbar->infos = NULL;
@@ -267,11 +269,11 @@ gboolean
 midori_transferbar_confirm_delete (MidoriTransferbar* transferbar)
 {
     GtkWidget* dialog = NULL;
-    GList* list;
     gboolean cancel = FALSE;
+    #if WEBKIT_CHECK_VERSION (1, 1, 3)
+    GList* list;
     gboolean all_done = TRUE;
 
-    #if WEBKIT_CHECK_VERSION (1, 1, 3)
     for (list = transferbar->infos; list != NULL; list = g_list_next (list))
     {
         TransferInfo* info = list->data;



More information about the Xfce4-commits mailing list