[Xfce4-commits] <midori:master> Always compare URI by string in katze_item_icon_loaded_cb

[Christian Dywan]

Updating branch refs/heads/master
         to 9a514f01abb72fa79dff2f56edce3994ea4aa05f (commit)
       from 988ac8db2a5c293bbede561c3cb93e1bdba15ee0 (commit)

commit 9a514f01abb72fa79dff2f56edce3994ea4aa05f
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Feb 3 19:06:58 2013 +0100

    Always compare URI by string in katze_item_icon_loaded_cb
    
    Fixes: https://bugs.launchpad.net/midori/+bug/1113268

 katze/katze-item.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/katze/katze-item.c b/katze/katze-item.c
index b7f0caa..beba534 100644
--- a/katze/katze-item.c
+++ b/katze/katze-item.c
@@ -447,7 +447,7 @@ katze_item_get_pixbuf (KatzeItem* item,
 
     if (widget && KATZE_ITEM_IS_FOLDER (item))
         return gtk_widget_render_icon (widget, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL);
-    if ((pixbuf = midori_paths_get_icon (katze_item_get_icon (item), widget)))
+    if ((pixbuf = midori_paths_get_icon (katze_item_get_icon (item), NULL)))
         return pixbuf;
     if ((pixbuf = midori_paths_get_icon (item->uri, widget)))
         return pixbuf;
@@ -470,8 +470,9 @@ katze_item_icon_loaded_cb (WebKitIconDatabase*    database,
                            GtkWidget*             image)
 {
     KatzeItem* item = g_object_get_data (G_OBJECT (image), "KatzeItem");
-    GdkPixbuf* pixbuf = midori_paths_get_icon (frame_uri, image);
-    if (pixbuf != NULL)
+    GdkPixbuf* pixbuf;
+    if (!strcmp (frame_uri, item->uri)
+      && (pixbuf = midori_paths_get_icon (frame_uri, image)))
     {
         gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
         g_object_unref (pixbuf);