[Xfce4-commits] <midori:master> Always pass view pointer to icon callback

[Christian Dywan]

Updating branch refs/heads/master
         to f4b4c5316643b3ddabb6359c09880322fd943823 (commit)
       from 4a412724ec303512e04a3a795461eaa7b0bbe1dc (commit)

commit f4b4c5316643b3ddabb6359c09880322fd943823
Author: Samuel Creshal <creshal at arcor.de>
Date:   Mon Mar 15 17:44:19 2010 +0100

    Always pass view pointer to icon callback

 midori/midori-view.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 80ffe81..32cb288 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);
 }