libubuntuone

Merge lp:~dobey/libubuntuone/incorrect-error-page into lp:libubuntuone

  1. incorrect-error-page
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 126
Merged at revision: 127
Proposed branch: lp:~dobey/libubuntuone/incorrect-error-page
Merge into: lp:libubuntuone
Diff against target: 18 lines (+5/-2)
1 file modified
libubuntuone/u1-music-store.c (+5/-2)
To merge this branch: bzr merge lp:~dobey/libubuntuone/incorrect-error-page
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Rodrigo Moya (community) Approve
Review via email: mp+53833@code.launchpad.net

Commit message

Only show the load_error.html on network errors since it only mentions network

To post a comment you must log in.
Revision history for this message
Rodrigo Moya (rodrigo-moya) :
review: Approve
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libubuntuone/u1-music-store.c'
2--- libubuntuone/u1-music-store.c 2011-03-14 15:31:38 +0000
3+++ libubuntuone/u1-music-store.c 2011-03-17 14:42:31 +0000
4@@ -899,9 +899,12 @@
5 static gboolean
6 load_error_cb (WebKitWebView *web_view, WebKitWebFrame *frame, const gchar *uri, GError *error, gpointer user_data)
7 {
8- load_internal_html_page (web_view, U1_DEFAULT_ERROR_PAGE, uri);
9+ if (error->domain == WEBKIT_NETWORK_ERROR) {
10+ load_internal_html_page (web_view, U1_DEFAULT_ERROR_PAGE, uri);
11+ return TRUE;
12+ }
13
14- return TRUE;
15+ return FALSE;
16 }
17
18 static gboolean

Subscribers

People subscribed via source and target branches