Merge lp:~dobey/libubuntuone/navigation-leak into lp:libubuntuone

[dobey]

Use a boolean variable to ensure parsed_uri gets freed

[Roberto Alsina (ralsina)]

+1

review: Approve

[John O'Brien (jdobrien)]

Looks good.

review: Approve

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-03-10 19:08:31 +0000
+++ libubuntuone/u1-music-store.c	2011-03-11 14:29:41 +0000
@@ -503,6 +503,7 @@
 	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
 	SoupURI *parsed_uri;
 	gchar *internal_uri;
+	gboolean return_val = FALSE;
 
 	/* Remove watching callback for the page */
 	if (music_store->priv->watch_id != 0) {
@@ -542,7 +543,7 @@
 			g_debug ("overriding the library page to ours");
 			load_delayed_page (web_view, library_override, policy_decision);
 
-			return TRUE;
+			return_val = TRUE;
 		}
 	} else if (!g_strcmp0 ((const gchar *) parsed_uri->host, "www.7digital.com")) {
 		/* host is 7digital.com. It must be in our store. */
@@ -561,7 +562,7 @@
 			g_free (internal_uri);
 			g_free (to_and_from_error_uris);
 
-			return TRUE;
+			return_val = TRUE;
 		}
 	} else if (!g_strcmp0 ((const gchar *) parsed_uri->host, "one.ubuntu.com")) {
 		/* host is one.ubuntu.com. It must not be the login page */
@@ -588,7 +589,7 @@
 			g_free (internal_uri);
 			g_free (to_and_from_error_uris);
 
-			return TRUE;
+			return_val = TRUE;
 		}
 	} else if (!g_strcmp0 ((const gchar *) parsed_uri->host, "login.ubuntu.com")) {
 		gchar *real_url;
@@ -613,13 +614,13 @@
 		g_free (internal_uri);
 		g_free (to_and_from_error_uris);
 
-		return TRUE;
+		return_val = TRUE;
 	}
 
 	/* Free memory */
 	soup_uri_free (parsed_uri);
 
-	return FALSE;
+	return return_val;
 }
 
 static void