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

Don't consider 'Plugin will handle load' an error

Browse source
This commit is contained in:
Christian Dywan 2011-04-07 20:59:08 +02:00
parent ee7dd822a0
commit 3d4f288ba0
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
midori/midori-view.c
View file

@ -1450,9 +1450,20 @@ webkit_web_view_load_error_cb (WebKitWebView* web_view,
GError* error, GError* error,
MidoriView* view) MidoriView* view)
{ {
gchar* title = g_strdup_printf (_("Error - %s"), uri); gchar* title;
gchar* message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri); gchar* message;
gboolean result = midori_view_display_error (view, uri, title, gboolean result;
switch (error->code)
{
case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD:
/* A plugin will take over. That's expected, it's not fatal. */
return FALSE;
}
title = g_strdup_printf (_("Error - %s"), uri);
message = g_strdup_printf (_("The page '%s' couldn't be loaded."), uri);
result = midori_view_display_error (view, uri, title,
message, error->message, _("Try again"), web_frame); message, error->message, _("Try again"), web_frame);
g_free (message); g_free (message);
g_free (title); g_free (title);