Updating branch refs/heads/master
to c522706d633ae658f825b8cffc93665318218e99 (commit)
from 0cde6239011915c148e7012e19bfb4186a125cef (commit)
commit c522706d633ae658f825b8cffc93665318218e99
Author: Christian Dywan <[email protected]>
Date: Tue Dec 13 23:28:35 2011 +0100
Only copy icon_uri when needed in _midori_web_view_load_icon
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 167b5c7..2d3c333 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -854,17 +854,16 @@ static void
_midori_web_view_load_icon (MidoriView* view)
{
GdkPixbuf* pixbuf;
- gchar* icon_uri;
gchar* icon_file;
gint icon_width, icon_height;
GdkPixbuf* pixbuf_scaled;
GtkSettings* settings;
pixbuf = NULL;
- icon_uri = g_strdup (view->icon_uri);
- if (midori_uri_is_http (icon_uri) || midori_uri_is_http (view->uri))
+ if (midori_uri_is_http (view->icon_uri) || midori_uri_is_http (view->uri))
{
+ gchar* icon_uri = g_strdup (view->icon_uri);
if (!icon_uri)
{
guint i = 8;
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
