aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2012-03-19 10:58:05 -0400
committerKen VanDine <ken.vandine@canonical.com>2012-03-19 10:58:05 -0400
commit30fc94dfddfd6afded367a5b1398158da46333d1 (patch)
tree793ca05fe37619606dab62298d8044fc3eca981a
parent3f88c380d5ab042c38881dda130bb73cd53e5a4a (diff)
downloadayatana-indicator-sound-30fc94dfddfd6afded367a5b1398158da46333d1.tar.gz
ayatana-indicator-sound-30fc94dfddfd6afded367a5b1398158da46333d1.tar.bz2
ayatana-indicator-sound-30fc94dfddfd6afded367a5b1398158da46333d1.zip
* debian/patches/sound_nua.patch
- don't try to free a static string (LP: #957387)
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/sound_nua.patch12
2 files changed, 10 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 7db09ad..d9b0da6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-sound (0.8.4.0-0ubuntu2) UNRELEASED; urgency=low
+
+ * debian/patches/sound_nua.patch
+ - don't try to free a static string (LP: #957387)
+
+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 19 Mar 2012 10:54:55 -0400
+
indicator-sound (0.8.4.0-0ubuntu1) precise; urgency=low
* New upstream release.
diff --git a/debian/patches/sound_nua.patch b/debian/patches/sound_nua.patch
index 97ba41b..869ae24 100644
--- a/debian/patches/sound_nua.patch
+++ b/debian/patches/sound_nua.patch
@@ -1,7 +1,7 @@
=== modified file 'src/sound-service-dbus.c'
---- old/src/sound-service-dbus.c 2012-03-02 16:34:50 +0000
-+++ new/src/sound-service-dbus.c 2012-03-16 17:24:56 +0000
-@@ -228,13 +228,20 @@
+--- old/src/sound-service-dbus.c 2012-03-16 17:59:34 +0000
++++ new/src/sound-service-dbus.c 2012-03-19 14:54:30 +0000
+@@ -227,8 +227,14 @@
gpointer user_data)
{
GError * error = NULL;
@@ -17,10 +17,4 @@
!g_spawn_command_line_async("xfce4-mixer", &error))
{
g_warning("Unable to show dialog: %s", error->message);
- g_error_free(error);
- }
-+ g_free (cmd);
- }
-
- static void