Merge lp:~dobey/libubuntuone/fix-load-order into lp:libubuntuone

[dobey]

Set the base_url on init, rather than later, as we may need it
Cancel the main page load callback if we're loading a u1ms link instead

[Roberto Alsina (ralsina)]

review: Approve

[Rodrigo Moya (rodrigo-moya)]

Looks ok

review: Approve

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-02-22 19:26:15 +0000
+++ libubuntuone/u1-music-store.c	2011-03-02 20:48:25 +0000
@@ -256,19 +256,9 @@
 get_url_to_use (U1MusicStore *music_store)
 {
 	gchar *oauth_consumer_token, *oauth_consumer_secret, *oauth_token = NULL, *oauth_token_secret = NULL, *real_url;
-	const gchar *url_to_use;
-
-	/* If U1MUSICSTOREURL is defined, use that instead of the real URL */
-	if (! (url_to_use = g_getenv ("U1MUSICSTOREURL")))
-		url_to_use = "https://one.ubuntu.com";
-
-	if (music_store->priv->base_url != NULL)
-		g_free (music_store->priv->base_url);
-
-	music_store->priv->base_url = g_strdup (url_to_use);
 
 	/* OAUth sign the URL */
-	if (g_str_has_prefix (url_to_use, "http://localhost") || g_str_has_prefix (url_to_use, "http://127.0.0.1")) {
+	if (g_str_has_prefix (music_store->priv->base_url, "http://localhost") || g_str_has_prefix (music_store->priv->base_url, "http://127.0.0.1")) {
 		const gchar *oauthfile;
 
 		oauthfile = g_getenv ("OAUTHKEYFILE");
@@ -957,6 +947,7 @@
 u1_music_store_init (U1MusicStore *music_store)
 {
 	gchar *new_user_agent;
+	const gchar *url_to_use;
 	GError *error = NULL;
 
 	if (!g_thread_get_initialized ())
@@ -966,6 +957,12 @@
 	music_store->priv->watched_downloads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 	music_store->priv->syncdaemon = syncdaemon_daemon_new ();
 
+	/* If U1MUSICSTOREURL is defined, use that instead of the real URL */
+	if (! (url_to_use = g_getenv ("U1MUSICSTOREURL")))
+		url_to_use = "https://one.ubuntu.com";
+
+	music_store->priv->base_url = g_strdup (url_to_use);
+
 	/* Initialize DBus */
 	music_store->priv->bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 	if (error) {
@@ -1096,6 +1093,12 @@
 	g_return_if_fail (U1_IS_MUSIC_STORE (music_store));
 	g_return_if_fail (url != NULL);
 
+	/* If the load_real_store callback is set up, disable it first */
+	if (music_store->priv->idle_cb > 0) {
+		g_source_remove (music_store->priv->idle_cb);
+		music_store->priv->idle_cb = 0;
+	}
+
 	real_url = g_strdup_printf ("%s%s?forward_on_to_url=%s",
 				    music_store->priv->base_url,
 				    U1_STORE_URL,