Merge lp:~indicator-applet-developers/indicator-application/ubuntu into lp:~ubuntu-desktop/indicator-application/ubuntu

[Ted Gould]

Mem leak

=== modified file 'ChangeLog'
--- ChangeLog	2011-08-11 16:54:27 +0000
+++ ChangeLog	2011-09-28 15:30:47 +0000
@@ -1,5 +1,29 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.4.0
+
[phone]  Ted Gould  <[e-mail]>
+
+	Memory leaks on double calls for properties
+
[phone]  Ted Gould  <[e-mail]>
+
+	Pulling in mterry's additional fixes
+
[phone]  Michael Terry  <[e-mail]>
+
+	free application fields before resetting them to new values
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ensure we set a default value for aicon
+
[phone]  Ted Gould  <[e-mail]>
+
+	Freeing properties on second run of building the app indicator
+
 2011-08-11  Ted Gould  <[e-mail]>
 
 	0.3.92
 
=== modified file 'configure'
--- configure	2011-08-11 16:55:25 +0000
+++ configure	2011-09-28 15:30:47 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for indicator-application 0.3.92.
+# Generated by GNU Autoconf 2.68 for indicator-application 0.4.0.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -572,8 +572,8 @@
 # Identity of this package.
 PACKAGE_NAME='indicator-application'
 PACKAGE_TARNAME='indicator-application'
-PACKAGE_VERSION='0.3.92'
-PACKAGE_STRING='indicator-application 0.3.92'
+PACKAGE_VERSION='0.4.0'
+PACKAGE_STRING='indicator-application 0.4.0'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1317,7 +1317,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-application 0.3.92 to adapt to many kinds of systems.
+\`configure' configures indicator-application 0.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1388,7 +1388,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-application 0.3.92:";;
+     short | recursive ) echo "Configuration of indicator-application 0.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1509,7 +1509,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-application configure 0.3.92
+indicator-application configure 0.4.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1789,7 +1789,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-application $as_me 0.3.92, which was
+It was created by indicator-application $as_me 0.4.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2610,7 +2610,7 @@
 
 # Define the identity of the package.
  PACKAGE=indicator-application
- VERSION=0.3.92
+ VERSION=0.4.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13365,7 +13365,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-application $as_me 0.3.92, which was
+This file was extended by indicator-application $as_me 0.4.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13431,7 +13431,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-application config.status 0.3.92
+indicator-application config.status 0.4.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2011-08-11 16:51:43 +0000
+++ configure.ac	2011-09-28 15:30:47 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-application, 0.3.92, [e-mail])
+AC_INIT(indicator-application, 0.4.0, [e-mail])
 AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.3.92)
+AM_INIT_AUTOMAKE(indicator-application, 0.4.0)
 
 AM_MAINTAINER_MODE
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-11 19:48:49 +0000
+++ debian/changelog	2011-09-28 15:30:47 +0000
@@ -1,3 +1,10 @@
+indicator-application (0.4.0-0ubuntu1~ppa1) oneiric; urgency=low
+
+  * New upstream release.
+    * Fix memory leak (LP: #829961)
+
+ -- Ted Gould <[e-mail]>  Wed, 28 Sep 2011 10:02:11 -0500
+
 indicator-application (0.3.92-0ubuntu1) oneiric; urgency=low
 
   * debian/rules: 
 
=== modified file 'src/application-service-appstore.c'
--- src/application-service-appstore.c	2011-08-11 16:55:25 +0000
+++ src/application-service-appstore.c	2011-09-28 15:30:47 +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,30 @@
 
 		/* Now the optional properties */
 
+		g_free(app->icon_desc);
+		if (icon_desc != NULL) {
+			app->icon_desc = g_variant_dup_string(icon_desc, NULL);
+		}
+		else {
+			app->icon_desc = g_strdup("");
+		}
+
+		g_free(app->aicon);
 		if (aicon_name != NULL) {
 			app->aicon = g_variant_dup_string(aicon_name, NULL);
-		}
-
+		} else {
+			app->aicon = g_strdup("");
+		}
+
+		g_free(app->aicon_desc);
+		if (aicon_desc != NULL) {
+			app->aicon_desc = g_variant_dup_string(aicon_desc, NULL);
+		}
+		else {
+			app->aicon_desc = g_strdup("");
+		}
+
+		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 +567,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 {
@@ -736,6 +766,9 @@
 	if (app->icon_desc != NULL) {
 		g_free(app->icon_desc);
 	}
+	if (app->aicon != NULL) {
+		g_free(app->aicon);
+	}
 	if (app->aicon_desc != NULL) {
 		g_free(app->aicon_desc);
 	}