Merge lp:~sergiodj/midori/sdj-ssl-error-improve into lp:midori

[Sergio Durigan Junior]

Improve error message when "Trust this website" doesn't work

Improve error message when gnome-keyring cannot be found, Midori is accessing a website with a self-signed SSL/TLS certificate, and the user clicks on "Trust this website".

[Cris Dywan (kalikiana)]

Reviewing this made me realize it's annoying to test since there's no trivial way to get Midori to pretend that the keyring is absent... at least something to consider for the future.

Looks very nice indeed!
Note for next time, always set a commit message in Launchpad, otherwise the merge bot will not touch it until you do.

review: Approve

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2015-09-25 21:30:31 +0000
+++ midori/midori-view.c	2015-09-26 22:40:41 +0000
@@ -623,7 +623,10 @@
                         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);