From: Samuel Creshal <creshal@arcor.de>
Date: Mon, 15 Mar 2010 16:44:19 +0000 (+0100)
Subject: Always pass view pointer to icon callback
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4b4c5316643b3ddabb6359c09880322fd943823;p=midori

Always pass view pointer to icon callback
---

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 80ffe81e..32cb2886 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -724,7 +724,6 @@ typedef struct
     gchar* icon_file;
     KatzeNetIconCb icon_cb;
     MidoriView* view;
-    gpointer user_data;
 } KatzeNetIconPriv;
 
 void
@@ -803,7 +802,7 @@ katze_net_icon_transfer_cb (KatzeNetRequest*  request,
 
     if (!pixbuf)
     {
-        priv->icon_cb (NULL, priv->user_data);
+        priv->icon_cb (NULL, priv->view);
         katze_net_icon_priv_free (priv);
         return;
     }
@@ -815,7 +814,7 @@ katze_net_icon_transfer_cb (KatzeNetRequest*  request,
                                              GDK_INTERP_BILINEAR);
     g_object_unref (pixbuf);
 
-    priv->icon_cb (pixbuf_scaled, priv->user_data);
+    priv->icon_cb (pixbuf_scaled, priv->view);
     katze_net_icon_priv_free (priv);
 }