diff options
| author | Ted Gould <ted@gould.cx> | 2011-03-16 14:49:53 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-03-16 14:49:53 -0500 |
| commit | c98c03e09896179829a9906e30b90f11adc21d07 (patch) | |
| tree | ead3e9033c0cf5134de1b28f3bfda39d873ad7a2 | |
| parent | 7c64f1595fc244617ff1f725ea5f3bd30234542b (diff) | |
| download | ayatana-indicator-application-c98c03e09896179829a9906e30b90f11adc21d07.tar.gz ayatana-indicator-application-c98c03e09896179829a9906e30b90f11adc21d07.tar.bz2 ayatana-indicator-application-c98c03e09896179829a9906e30b90f11adc21d07.zip | |
Drop debian/patches/fix-null-string-to-variant-crash.patch
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/fix-null-string-to-variant-crash.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 2 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog index 7cc4d91..1f56fea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ indicator-application (0.2.95-0ubuntu1~ppa1) UNRELEASED; urgency=low ∘ No more duplication of indicators on the panel (LP: #708243) ∘ Using proper object on async call (LP: #734584) ∘ Protect from the accessible description being NULL. (LP: #724767) + * Drop debian/patches/fix-null-string-to-variant-crash.patch - -- Ted Gould <ted@ubuntu.com> Wed, 16 Mar 2011 14:47:38 -0500 + -- Ted Gould <ted@ubuntu.com> Wed, 16 Mar 2011 14:49:34 -0500 indicator-application (0.2.94-0ubuntu2) natty; urgency=low diff --git a/debian/patches/fix-null-string-to-variant-crash.patch b/debian/patches/fix-null-string-to-variant-crash.patch deleted file mode 100644 index ebcad4c..0000000 --- a/debian/patches/fix-null-string-to-variant-crash.patch +++ /dev/null @@ -1,19 +0,0 @@ -=== modified file 'src/application-service-appstore.c' -Index: indicator-application.ubu/src/application-service-appstore.c -=================================================================== ---- indicator-application.ubu.orig/src/application-service-appstore.c 2011-02-25 08:50:32.170749000 -0500 -+++ indicator-application.ubu/src/application-service-appstore.c 2011-02-25 08:53:26.313552982 -0500 -@@ -1238,9 +1238,10 @@ - } - - g_variant_builder_add (&builder, "(sisossss)", app->icon, -- position++, app->dbus_name, app->menu, -- app->icon_theme_path, app->label, -- app->guide, app->icon_desc); -+ position++, app->dbus_name, app->menu, -+ app->icon_theme_path, app->label, -+ app->guide, -+ (app->icon_desc != NULL) ? app->icon_desc : ""); - } - - out = g_variant_builder_end(&builder); diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 8d2cb6b..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-null-string-to-variant-crash.patch |