[Xfce4-commits] <midori:master> Set about:dial URI and explicitly convert to "" for display

[Christian Dywan]

Updating branch refs/heads/master
         to d423123dd32eca23043c548599743c40150c44c8 (commit)
       from 6e22ef9b349cf22c88282ed7514b3f33968a41c1 (commit)

commit d423123dd32eca23043c548599743c40150c44c8
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Apr 3 01:04:56 2013 +0200

    Set about:dial URI and explicitly convert to "" for display

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

diff --git a/midori/midori-view.c b/midori/midori-view.c
index f614170..2f28a83 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4118,13 +4118,13 @@ midori_view_set_uri (MidoriView*  view,
                 timer = g_timer_new ();
             #endif
 
-            midori_tab_set_uri (MIDORI_TAB (view), "about:blank");
+            midori_tab_set_uri (MIDORI_TAB (view), uri);
             midori_tab_set_mime_type (MIDORI_TAB (view), "text/html");
             katze_item_set_meta_string (view->item, "mime-type", "text/html");
             katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_UNDELAYED);
 
             html = dial != NULL ? midori_speed_dial_get_html (dial, NULL) : "";
-            midori_view_set_html (view, html, NULL, NULL);
+            midori_view_set_html (view, html, uri, NULL);
 
             #ifdef G_ENABLE_DEBUG
             if (midori_debug ("startup"))
@@ -4454,7 +4454,9 @@ midori_view_get_display_uri (MidoriView* view)
     uri = midori_tab_get_uri (MIDORI_TAB (view));
     /* Something in the stack tends to turn "" into "about:blank".
        Yet for practical purposes we prefer "".  */
-    if (!strcmp (uri, "about:blank") || !strcmp (uri, "about:private"))
+    if (!strcmp (uri, "about:blank")
+     || !strcmp (uri, "about:dial")
+     || !strcmp (uri, "about:private"))
         return "";
 
     return uri;