]> spindle.queued.net Git - midori/commitdiff
Always pass view pointer to icon callback
authorSamuel Creshal <creshal@arcor.de>
Mon, 15 Mar 2010 16:44:19 +0000 (17:44 +0100)
committerChristian Dywan <christian@twotoasts.de>
Mon, 15 Mar 2010 16:45:00 +0000 (17:45 +0100)
midori/midori-view.c

index 80ffe81ef01d24b36b41f424e58e0e3eb7b4ec70..32cb2886ab04f1b4d12e9b4cccc2c586b96baa92 100644 (file)
@@ -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);
 }