]> spindle.queued.net Git - midori/commitdiff
Don't try to load icons of special pages
authorChristian Dywan <christian@twotoasts.de>
Mon, 14 Mar 2011 00:03:37 +0000 (01:03 +0100)
committerChristian Dywan <christian@twotoasts.de>
Mon, 14 Mar 2011 00:03:37 +0000 (01:03 +0100)
midori/midori-view.c

index 4749c9deb9eb0d96db67ad1910da5d890d81a3ec..57345e1cff9dd6b4e5e36ea35a5acac41b3e2158 100644 (file)
@@ -899,7 +899,7 @@ _midori_web_view_load_icon (MidoriView* view)
             g_free (icon_file);
             katze_assign (view->icon_uri, icon_uri);
         }
-        else
+        else if (!view->special)
         {
             priv = g_slice_new (KatzeNetIconPriv);
             priv->icon_file = icon_file;
@@ -4040,17 +4040,13 @@ midori_view_set_uri (MidoriView*  view,
         #if WEBKIT_CHECK_VERSION (1, 1, 6)
         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]));
             midori_view_display_error (
-                view, view->uri, title,
+                view, view->uri, view->title,
                 _("Page loading delayed"),
                 _("Loading delayed either due to a recent crash or startup preferences."),
                 _("Load Page"),
                 NULL);
-            g_free (title);
             katze_item_set_uri (view->item, uri);
             g_object_notify (G_OBJECT (view), "uri");
         }