[Xfce4-commits] <midori:master> Cleanup unused variable in adblock

[Christian Dywan]

Updating branch refs/heads/master
         to fc7e30f51633f3fd21a35ce3e05d25c86242ae75 (commit)
       from 2a540a087874c3c02cc910b7149401e4012c0014 (commit)

commit fc7e30f51633f3fd21a35ce3e05d25c86242ae75
Author: André Stösel <andre at stoesel.de>
Date:   Thu Apr 12 22:56:35 2012 +0200

    Cleanup unused variable in adblock

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

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 2b35fa5..e9cb482 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -808,7 +808,7 @@ adblock_resource_request_starting_cb (WebKitWebView*         web_view,
                                       WebKitWebResource*     web_resource,
                                       WebKitNetworkRequest*  request,
                                       WebKitNetworkResponse* response,
-                                      GtkWidget*             image)
+                                      MidoriView*            view)
 {
     SoupMessage* msg;
     GList* blocked_uris;
@@ -1012,7 +1012,6 @@ adblock_add_tab_cb (MidoriBrowser*   browser,
                     MidoriExtension* extension)
 {
     GtkWidget* web_view = midori_view_get_web_view (view);
-    GtkWidget* image = g_object_get_data (G_OBJECT (browser), "status-image");
 
     g_signal_connect (web_view, "window-object-cleared",
         G_CALLBACK (adblock_window_object_cleared_cb), 0);
@@ -1022,9 +1021,9 @@ adblock_add_tab_cb (MidoriBrowser*   browser,
     g_signal_connect (web_view, "navigation-policy-decision-requested",
         G_CALLBACK (adblock_navigation_policy_decision_requested_cb), view);
     g_signal_connect (web_view, "resource-request-starting",
-        G_CALLBACK (adblock_resource_request_starting_cb), image);
+        G_CALLBACK (adblock_resource_request_starting_cb), view);
     g_signal_connect (web_view, "load-finished",
-        G_CALLBACK (adblock_load_finished_cb), image);
+        G_CALLBACK (adblock_load_finished_cb), view);
 }
 
 static void
@@ -1501,18 +1500,17 @@ adblock_deactivate_tabs (MidoriView*      view,
                          MidoriExtension* extension)
 {
     GtkWidget* web_view = midori_view_get_web_view (view);
-    GtkWidget* image = g_object_get_data (G_OBJECT (browser), "status-image");
 
     g_signal_handlers_disconnect_by_func (
        web_view, adblock_window_object_cleared_cb, 0);
     g_signal_handlers_disconnect_by_func (
        web_view, adblock_populate_popup_cb, extension);
     g_signal_handlers_disconnect_by_func (
-       web_view, adblock_resource_request_starting_cb, image);
+       web_view, adblock_resource_request_starting_cb, view);
     g_signal_handlers_disconnect_by_func (
-       web_view, adblock_load_finished_cb, image);
+       web_view, adblock_load_finished_cb, view);
     g_signal_handlers_disconnect_by_func (
-            web_view, adblock_navigation_policy_decision_requested_cb, view);
+       web_view, adblock_navigation_policy_decision_requested_cb, view);
 }
 
 static void