diff options
| author | Ted Gould <ted@gould.cx> | 2011-04-12 15:16:57 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-04-12 15:16:57 -0500 |
| commit | f428921733f40e514040ed0af6fea70c2a0a4687 (patch) | |
| tree | fed8f97b8c973c1adca138e5c4cc17838fa878cf | |
| parent | 0536a41363233ca2663d7e8a5bada3eb80687d73 (diff) | |
| parent | d24fd27425f63785fb73b0a96efd21631b4fe8d0 (diff) | |
| download | ayatana-indicator-application-f428921733f40e514040ed0af6fea70c2a0a4687.tar.gz ayatana-indicator-application-f428921733f40e514040ed0af6fea70c2a0a4687.tar.bz2 ayatana-indicator-application-f428921733f40e514040ed0af6fea70c2a0a4687.zip | |
* Upstream Merge
* Free app using application_free() instead of just freeing the
memory (LP: #743564)
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | src/application-service-appstore.c | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index f21e951..49b0a0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-application (0.3.1-0ubuntu3~ppa1) UNRELEASED; urgency=low + + * Upstream Merge + * Free app using application_free() instead of just freeing the + memory (LP: #743564) + + -- Ted Gould <ted@ubuntu.com> Tue, 12 Apr 2011 15:16:13 -0500 + indicator-application (0.3.1-0ubuntu2) natty; urgency=low * debian/patches/lp_743564.patch diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 3e827d5..4cafdfc 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -498,7 +498,8 @@ got_all_properties (GObject * source_object, GAsyncResult * res, if (menu == NULL || id == NULL || category == NULL || status == NULL || icon_name == NULL) { g_warning("Notification Item on object %s of %s doesn't have enough properties.", app->dbus_object, app->dbus_name); - g_free(app); // Need to do more than this, but it gives the idea of the flow we're going for. + if (!app->validated) + application_free(app); } else { app->validated = TRUE; |