debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't try to load icons of special pages

Browse source
This commit is contained in:
Christian Dywan 2011-03-14 01:03:37 +01:00
parent f17751b91a
commit 7ac71b6bba
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
midori/midori-view.c
View file

@ -899,7 +899,7 @@ _midori_web_view_load_icon (MidoriView* view)
g_free (icon_file); g_free (icon_file);
katze_assign (view->icon_uri, icon_uri); katze_assign (view->icon_uri, icon_uri);
} }
else else if (!view->special)
{ {
priv = g_slice_new (KatzeNetIconPriv); priv = g_slice_new (KatzeNetIconPriv);
priv->icon_file = icon_file; priv->icon_file = icon_file;
@ -4040,17 +4040,13 @@ midori_view_set_uri (MidoriView* view,
#if WEBKIT_CHECK_VERSION (1, 1, 6) #if WEBKIT_CHECK_VERSION (1, 1, 6)
else if (g_str_has_prefix (uri, "pause:")) else if (g_str_has_prefix (uri, "pause:"))
{ {
gchar* title;
title = g_strdup_printf ("%s", view->title);
katze_assign (view->uri, g_strdup (&uri[6])); katze_assign (view->uri, g_strdup (&uri[6]));
midori_view_display_error ( midori_view_display_error (
view, view->uri, title, view, view->uri, view->title,
_("Page loading delayed"), _("Page loading delayed"),
_("Loading delayed either due to a recent crash or startup preferences."), _("Loading delayed either due to a recent crash or startup preferences."),
_("Load Page"), _("Load Page"),
NULL); NULL);
g_free (title);
katze_item_set_uri (view->item, uri); katze_item_set_uri (view->item, uri);
g_object_notify (G_OBJECT (view), "uri"); g_object_notify (G_OBJECT (view), "uri");
} }