Midori Web Browser

Merge lp:~tuxator/midori/error-page into lp:~alexander-wilms/midori/midori

  1. error-page
  2. Merge into midori
Proposed by Paweł Forysiuk
Status: Merged
Merged at revision: 6244
Proposed branch: lp:~tuxator/midori/error-page
Merge into: lp:~alexander-wilms/midori/midori
Diff against target: 72 lines (+16/-6)
2 files modified
data/error.html (+1/-1)
midori/midori-view.c (+15/-5)
To merge this branch: bzr merge lp:~tuxator/midori/error-page
Reviewer Review Type Date Requested Status
982c80311320c1b Approve
Review via email: mp+171923@code.launchpad.net
To post a comment you must log in.
Revision history for this message
982c80311320c1b (alexander-wilms) wrote :

Lookin good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/error.html'
2--- data/error.html 2013-06-26 20:09:59 +0000
3+++ data/error.html 2013-06-27 21:57:27 +0000
4@@ -10,7 +10,7 @@
5 </head>
6 <body>
7 <img id="logo" src="res://logo-shade.png" />
8- <div id="main" style="{error_icon}">
9+<div id="main" style="background-image: url({error_icon});">
10 <div id="text">
11 <h1>{title}</h1>
12 <p class="message">{message}<br><i>{description}</i></p>
13
14=== modified file 'midori/midori-view.c'
15--- midori/midori-view.c 2013-06-27 17:55:56 +0000
16+++ midori/midori-view.c 2013-06-27 21:57:27 +0000
17@@ -1214,10 +1214,10 @@
18 "rtl" : "ltr",
19 "{title}", title_escaped,
20 "{favicon}", katze_str_non_null (favicon),
21- "{error_icon}", error_icon,
22+ "{error_icon}", katze_str_non_null (error_icon),
23 "{message}", message,
24 "{description}", description,
25- "{suggestions}", suggestions,
26+ "{suggestions}", katze_str_non_null (suggestions),
27 "{tryagain}", try_again,
28 "{uri}", uri,
29 "{hide-button-images}", show_button_images ? "" : "display:none",
30@@ -1254,6 +1254,7 @@
31 #endif
32 gchar* title;
33 gchar* message;
34+ GString* suggestions;
35 gboolean result;
36
37 /* The unholy trinity; also ignored in Webkit's default error handler */
38@@ -1270,13 +1271,20 @@
39
40 title = g_strdup_printf (_("'%s' can't be found"), midori_uri_parse_hostname(uri, NULL));
41 message = g_strdup_printf (_("The page '%s' couldn't be loaded:"), midori_uri_parse_hostname(uri, NULL));
42+
43+ suggestions = g_string_new ("<ul id=\"suggestions\"><li>");
44+ g_string_append_printf (suggestions, "%s</li><li>%s</li><li>%s</li></ul>",
45+ _("Check the address for typos"),
46+ _("Make sure that an ethernet cable is plugged in or the wireless card is activated"),
47+ _("Verify that your network settings are correct"));
48+
49 result = midori_view_display_error (view,
50 uri,
51- "background-image: url(stock://gtk-dialog-warning);",
52+ "stock://gtk-dialog-warning",
53 title,
54 message,
55 error->message,
56- _("<ul id=\"suggestions\"><li>Check the address for typos</li><li>Make sure that an ethernet cable is plugged in or the wireless card is activated</li><li>Verify that your network settings are correct</li></ul>"),
57+ g_string_free (suggestions, FALSE),
58 _("Try Again"),
59 web_frame);
60 g_free (message);
61@@ -4217,8 +4225,10 @@
62 midori_tab_set_uri (MIDORI_TAB (view), uri);
63 midori_tab_set_special (MIDORI_TAB (view), TRUE);
64 katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_PENDING_UNDELAY);
65- midori_view_display_error (view, NULL, NULL, NULL, NULL, _("Page loading delayed"),
66+ midori_view_display_error (view, NULL, "stock://gtk-connect", NULL,
67+ _("Page loading delayed"),
68 _("Loading delayed either due to a recent crash or startup preferences."),
69+ NULL,
70 _("Load Page"),
71 NULL);
72 }

Subscribers

People subscribed via source and target branches