Merge lp:~ted/indicator-application/lp829961 into lp:indicator-application/0.4

[Ted Gould]

Adding a free of properties that are already set when we grab them twice.

[Hernando Torque (htorque)]

No change in memory usage over 20 minutes → this seems to fix it. :)

[Neil J. Patel (njpatel)]

Looks good, approved.

review: Approve

=== modified file 'src/application-service-appstore.c'
--- src/application-service-appstore.c	2011-07-22 20:35:19 +0000
+++ src/application-service-appstore.c	2011-09-14 22:10:19 +0000
@@ -508,6 +508,14 @@
 	else {
 		app->validated = TRUE;
 
+		/* It is possible we're coming through a second time and
+		   getting the properties.  So we need to ensure we don't
+		   already have them stored */
+		g_free(app->id);
+		g_free(app->category);
+		g_free(app->icon);
+		g_free(app->menu);
+
 		app->id = g_variant_dup_string(id, NULL);
 		app->category = g_variant_dup_string(category, NULL);
 		app->status = string_to_status(g_variant_get_string(status, NULL));
@@ -516,10 +524,12 @@
 
 		/* Now the optional properties */
 
+		g_free(app->aicon);
 		if (aicon_name != NULL) {
 			app->aicon = g_variant_dup_string(aicon_name, NULL);
 		}
 
+		g_free(app->icon_theme_path);
 		if (icon_theme_path != NULL) {
 			app->icon_theme_path = g_variant_dup_string(icon_theme_path, NULL);
 		} else {
@@ -539,12 +549,14 @@
 		g_debug("'%s' ordering index is '%X'", app->id, app->ordering_index);
 		app->appstore->priv->applications = g_list_sort_with_data(app->appstore->priv->applications, app_sort_func, NULL);
 
+		g_free(app->label);
 		if (label != NULL) {
 			app->label = g_variant_dup_string(label, NULL);
 		} else {
 			app->label = g_strdup("");
 		}
 
+		g_free(app->guide);
 		if (guide != NULL) {
 			app->guide = g_variant_dup_string(guide, NULL);
 		} else {