aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/lp_743564.patch14
-rw-r--r--debian/patches/series1
3 files changed, 2 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index 49b0a0b..b666087 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ 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)
+ * Drop debian/patches/lp_743564.patch as merged upstream.
- -- Ted Gould <ted@ubuntu.com> Tue, 12 Apr 2011 15:16:13 -0500
+ -- Ted Gould <ted@ubuntu.com> Tue, 12 Apr 2011 15:17:33 -0500
indicator-application (0.3.1-0ubuntu2) natty; urgency=low
diff --git a/debian/patches/lp_743564.patch b/debian/patches/lp_743564.patch
deleted file mode 100644
index 8a6030b..0000000
--- a/debian/patches/lp_743564.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-=== 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
deleted file mode 100644
index 206497e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-lp_743564.patch