diff options
| author | Ted Gould <ted@gould.cx> | 2011-04-12 15:15:56 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-04-12 15:15:56 -0500 |
| commit | 0536a41363233ca2663d7e8a5bada3eb80687d73 (patch) | |
| tree | 746c8dc9e021dae4811416a7d02fe3a8d4834241 | |
| parent | 72fbb0886a57574d1442ad6ab18b7404ccbb2375 (diff) | |
| parent | e25a3f60f7f29c14bc0c32ef5e732c79075d70f1 (diff) | |
| download | ayatana-indicator-application-0536a41363233ca2663d7e8a5bada3eb80687d73.tar.gz ayatana-indicator-application-0536a41363233ca2663d7e8a5bada3eb80687d73.tar.bz2 ayatana-indicator-application-0536a41363233ca2663d7e8a5bada3eb80687d73.zip | |
Merge to U. Desktop
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/patches/lp_743564.patch | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 24 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index bd5d01d..f21e951 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,12 @@ -indicator-application (0.3.1-0ubuntu1~ppa1) natty; urgency=low +indicator-application (0.3.1-0ubuntu2) natty; urgency=low + + * debian/patches/lp_743564.patch + - Don't merely free an app, it has to be properly removed from + list (LP: #743564) + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 08 Apr 2011 16:54:24 -0400 + +indicator-application (0.3.1-0ubuntu1) natty; urgency=low * New upstream release. ∘ Fix the name of "nm-applet" in the overrides file diff --git a/debian/patches/lp_743564.patch b/debian/patches/lp_743564.patch new file mode 100644 index 0000000..8a6030b --- /dev/null +++ b/debian/patches/lp_743564.patch @@ -0,0 +1,14 @@ +=== modified file 'src/application-service-appstore.c' +--- old/src/application-service-appstore.c 2011-04-07 18:33:33 +0000 ++++ new/src/application-service-appstore.c 2011-04-08 20:54:15 +0000 +@@ -498,7 +498,8 @@ + 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; + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..206497e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +lp_743564.patch |