← Back to branch summary

~kelemeng/libubuntuone/bug786632

« back to all changes in this revision

Viewing changes to libubuntuone/u1-music-store.c

  • Committer: Rodney Dawes
  • Date: 2011-04-15 20:56:10 UTC
  • mfrom: (37.1.23 upstream)
  • mto: This revision was merged to the branch mainline in revision 86.
  • Revision ID: rodney.dawes@canonical.com-20110415205610-gclrafdag8272cv7
* New upstream release.
  - Incorrect status on My Downloads page for some songs (LP: #663001)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libubuntuone/u1-music-store.c
50
50
#define U1_CONNECTING_PAGE "connecting.html" 
51
51
#define U1_INITIAL_PAGE "<html><body>Loading Ubuntu One music store</body></html>"
52
52
 
 
53
#define DEFAULT_ENCODING "UTF-8"
53
54
#define MAXIMUM_AUTH_RETRIES 5
54
55
 
55
56
struct _U1MusicStorePrivate {
822
823
        }
823
824
 
824
825
        /* Parse HTML */
825
 
        html_doc = htmlParseDoc ((xmlChar *) html->str, NULL);
 
826
        html_doc = htmlParseDoc ((xmlChar *) html->str, DEFAULT_ENCODING);
826
827
        root_node = xmlDocGetRootElement (html_doc);
827
828
        parse_html_node (music_store, web_view, root_node, current_downloads);
828
829
 
1271
1272
                                                  webkit_web_view_get_settings (WEBKIT_WEB_VIEW (music_store->priv->web_viewer))));
1272
1273
        g_object_set (G_OBJECT (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (music_store->priv->web_viewer))),
1273
1274
                      "user-agent", new_user_agent,
 
1275
                      "default-encoding", DEFAULT_ENCODING,
1274
1276
                      "enable-default-context-menu", g_getenv ("U1SHOWCONTEXTMENU") != NULL,
1275
1277
                      "enable-plugins", FALSE,
1276
1278
                      NULL);
1296
1298
        /* Show a temp view when loading the initial store page */
1297
1299
        music_store->priv->initial_web_viewer = webkit_web_view_new ();
1298
1300
        g_object_set (G_OBJECT (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (music_store->priv->initial_web_viewer))),
 
1301
                      "user-agent", new_user_agent,
 
1302
                      "default-encoding", DEFAULT_ENCODING,
1299
1303
                      "enable-default-context-menu", g_getenv ("U1SHOWCONTEXTMENU") != NULL,
 
1304
                      "enable-plugins", FALSE,
1300
1305
                      NULL);
1301
1306
        load_internal_html_page (WEBKIT_WEB_VIEW (music_store->priv->initial_web_viewer), 
1302
1307
                                 U1_CONNECTING_PAGE, NULL);