[Xfce4-commits] <midori:master> Disable statusbar button showing adblock status

[Christian Dywan]

Updating branch refs/heads/master
         to 5238431d840e70ec22cc65cbc84e65c1f9247df9 (commit)
       from ca5230d2efcf14b1135d2dfea322cb65a20d6b89 (commit)

commit 5238431d840e70ec22cc65cbc84e65c1f9247df9
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Nov 13 18:37:00 2009 +0100

    Disable statusbar button showing adblock status
    
    It doesn't work that well currently and it's not clear how it should
    change, so we're disabling it for the moment.

 extensions/adblock.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 6e55af8..58eac99 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -539,6 +539,7 @@ adblock_resource_request_starting_cb (WebKitWebView*         web_view,
         return;
     if (g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, (char*)uri))
     {
+        #if 0
         gchar* text;
 
         if (gtk_widget_get_has_tooltip (image))
@@ -547,6 +548,7 @@ adblock_resource_request_starting_cb (WebKitWebView*         web_view,
            text = g_strdup_printf ("Blocked content: \n%s", uri);
         gtk_widget_set_tooltip_text (image, text);
         g_free (text);
+        #endif
 
         webkit_network_request_set_uri (request, "about:blank");
     }
@@ -614,9 +616,13 @@ adblock_app_add_browser_cb (MidoriApp*       app,
     GtkWidget* image;
 
     statusbar = katze_object_get_object (browser, "statusbar");
+    #if 0
     image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU);
     gtk_widget_show (image);
     gtk_box_pack_start (GTK_BOX (statusbar), image, FALSE, FALSE, 3);
+    #else
+    image = NULL;
+    #endif
 
     midori_browser_foreach (browser,
           (GtkCallback)adblock_add_tab_foreach_cb, image);