summaryrefslogtreecommitdiff
path: root/midori
diff options
context:
space:
mode:
authorSergio Durigan Junior <sergiodj@sergiodj.net>2015-09-26 17:33:05 -0400
committerSergio Durigan Junior <sergiodj@sergiodj.net>2015-09-26 17:33:05 -0400
commit1b2a4135ed0df17016bd6e74dacc03d6ecf4a5e5 (patch)
treeb77998d884e08065fda244626b207878a691a6a2 /midori
parent9a5a537606d397e74cade6f457f8dede1574df77 (diff)
downloadmidori-git-1b2a4135ed0df17016bd6e74dacc03d6ecf4a5e5.tar.gz
Improving error message when gnome-keyring is not running.
Currently, when Midori cannot find a proper instance of gnome-keyring running, it won't accept a self-signed certificate and will issue a cryptic error message: "Error granting trust: Couldn't find a place to store the pinned certificate pkcs11:library-manufacturer=GNOME%20Keyring , pkcs11:library-description=PKCS%2311%20Kit%20Trust%20Module" This error is already explained in the FAQ, but we could do better: we can provide a direct link to the FAQ section that teaches the user how to fix this. That's what we do in this commit. As a reference, Debian bug #799963 started this discussion.
Diffstat (limited to 'midori')
-rw-r--r--midori/midori-view.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 96a5cc00..11dab9fd 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -623,7 +623,10 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView* web_view
gchar* slots = g_strjoinv (" , ", (gchar**)gcr_pkcs11_get_trust_lookup_uris ());
gchar* title = g_strdup_printf ("Error granting trust: %s", error->message);
midori_tab_stop_loading (MIDORI_TAB (view));
- midori_view_display_error (view, NULL, NULL, NULL, title, slots, NULL,
+ midori_view_display_error (view, NULL, NULL, NULL, title, slots, _("Please look at our \
+<a href=\"http://midori-browser.org/faqs/\" target=\"_blank\">FAQ</a>, \
+section \"<a href=\"http://midori-browser.org/faqs/#security_features\" target=\"_blank\">Security Features</a>\", \
+to understand how you can solve this problem."),
_("Trust this website"), NULL);
g_free (title);
g_free (slots);