Updating branch refs/heads/master to 4173d2f0cce95547ea0559220a85aaa2aa081c80 (commit) from 21ed1ea2e7a4aba0f7f6aea2d471d9fec4898985 (commit)
commit 4173d2f0cce95547ea0559220a85aaa2aa081c80 Author: Christian Dywan <christ...@twotoasts.de> Date: Thu Dec 6 20:34:26 2012 +0100 Replace error:nodocs with about:nodocs midori/midori-browser.c | 4 +--- midori/midori-view.c | 10 ++++------ tests/tab.vala | 4 ++-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index f7e8fa0..55b0c40 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -4673,12 +4673,10 @@ midori_browser_get_docs (gboolean error) if (found) return g_filename_to_uri (path, NULL, NULL); #endif - #ifdef DOCDIR if (g_access (DOCDIR "/faq.html", F_OK) == 0) return g_strdup ("file://" DOCDIR "/faq.html"); else - #endif - return error ? g_strdup_printf ("error:nodocs %s/faq.html", DOCDIR) : NULL; + return error ? g_strdup ("about:nodocs") : NULL; } static void diff --git a/midori/midori-view.c b/midori/midori-view.c index f2d70d6..ea9e354 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3772,7 +3772,7 @@ list_video_formats (JSContextRef js_context) static const gchar* valid_about_uris[] = { "about:widgets", "about:private", - "error:nodocs", + "about:nodocs", "http://.invalid", "about:geolocation", "about:paths", @@ -3841,12 +3841,10 @@ midori_view_set_uri (MidoriView* view, } #endif } - /* This is not prefectly elegant, but creating - special pages inline is the simplest solution. */ - else if (g_str_has_prefix (uri, "error:") || midori_uri_is_blank (uri)) + else if (midori_uri_is_blank (uri)) { data = NULL; - if (!strncmp (uri, "error:nodocs ", 13)) + if (!strcmp (uri, "about:nodocs")) { gchar* title = g_strdup_printf (_("No documentation installed")); data = g_strdup_printf ( @@ -3860,7 +3858,7 @@ midori_view_set_uri (MidoriView* view, "verify that the build is setup properly. " "<a href=\"http://wiki.xfce.org/midori/faq\">View the FAQ online</a>" "</body></html>", - title, title, &uri[13]); + title, title, DOCDIR); g_free (title); } else if (!strcmp (uri, "about:widgets")) diff --git a/tests/tab.vala b/tests/tab.vala index a4b6d20..1b63761 100644 --- a/tests/tab.vala +++ b/tests/tab.vala @@ -111,9 +111,9 @@ void tab_special () { assert (tab.special); assert (!tab.can_save ()); - tab.set_uri ("error:nodocs file:///some/docs/path"); + tab.set_uri ("about:nodocs"); do { loop.iteration (true); } while (tab.load_status != Midori.LoadStatus.FINISHED); - assert (!tab.is_blank ()); + assert (tab.is_blank ()); assert (!tab.can_view_source ()); assert (tab.special); assert (!tab.can_save ()); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits