debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Say 'Error - URI' in place of 'Error' in the title

Browse source 
When several pages fail at the same time, for instance due to
network issues, it can be important to tell those pages apart.
This commit is contained in:
Christian Dywan 2009-09-02 23:40:52 +02:00
parent 6eb7e69212
commit f259d082f2
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
midori/midori-view.c
View file

@ -770,6 +770,7 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view,
guint port; guint port;
gchar* res_root; gchar* res_root;
gchar* stock_root; gchar* stock_root;
gchar* title;
gchar* message; gchar* message;
gchar* result; gchar* result;
@ -778,9 +779,10 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view,
res_root = g_strdup_printf ("http://localhost:%d/res", port); res_root = g_strdup_printf ("http://localhost:%d/res", port);
stock_root = g_strdup_printf ("http://localhost:%d/stock", port); stock_root = g_strdup_printf ("http://localhost:%d/stock", port);
title = g_strdup_printf (_("Error - %s"), uri);
message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri); message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri);
result = sokoke_replace_variables (template, result = sokoke_replace_variables (template,
"{title}", _("Error"), "{title}", title,
"{message}", message, "{message}", message,
"{description}", error->message, "{description}", error->message,
"{tryagain}", _("Try again"), "{tryagain}", _("Try again"),
@ -789,6 +791,7 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view,
NULL); NULL);
g_free (template); g_free (template);
g_free (message); g_free (message);
g_free (title);
webkit_web_frame_load_alternate_string (web_frame, webkit_web_frame_load_alternate_string (web_frame,
result, res_root, uri); result, res_root, uri);
@ -3034,11 +3037,11 @@ midori_view_reload (MidoriView* view,
#if WEBKIT_CHECK_VERSION (1, 1, 6) #if WEBKIT_CHECK_VERSION (1, 1, 6)
/* WebKit 1.1.6 doesn't handle "alternate content" flawlessly, /* WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
so reloading via Javascript works but not via API calls. */ so reloading via Javascript works but not via API calls. */
title = g_strdup (_("Error")); title = g_strdup_printf (_("Error - %s"), view->uri);
#else #else
/* Error pages are special, we want to try loading the destination /* Error pages are special, we want to try loading the destination
again, not the error page which isn't even a proper page */ again, not the error page which isn't even a proper page */
title = g_strdup_printf (_("Not found - %s"), view->uri); title = g_strdup_printf (_("Error - %s"), view->uri);
#endif #endif
if (view->title && strstr (title, view->title)) if (view->title && strstr (title, view->title))
webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), view->uri); webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), view->uri);