Updating branch refs/heads/master
         to 6d3c0538535ea2b25e4db8df23aa250fc9067fe3 (commit)
       from d9ca4bc8eda1c442f86e41ad59f058c6f9f07c1d (commit)

commit 6d3c0538535ea2b25e4db8df23aa250fc9067fe3
Author: Christian Dywan <[email protected]>
Date:   Thu Feb 28 00:36:36 2013 +0100

    Only ref icon if non-NULL in midori_view_apply_icon

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

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 910c6b8..6488dc2 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -420,7 +420,9 @@ midori_view_apply_icon (MidoriView*  view,
 {
     katze_item_set_icon (view->item, icon_name);
     /* katze_item_get_image knows about this pixbuf */
-    g_object_set_data_full (G_OBJECT (view->item), "pixbuf", g_object_ref 
(icon),
+    if (icon != NULL)
+        g_object_ref (icon);
+    g_object_set_data_full (G_OBJECT (view->item), "pixbuf", icon,
                             (GDestroyNotify)g_object_unref);
     katze_object_assign (view->icon, icon);
     g_object_notify (G_OBJECT (view), "icon");
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits

Reply via email to