[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, master, updated. debian/1.9.3-1-7-g23c7e6a

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit edcfa519c217ecca0d44b3169412b736b792732e
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Fri Mar 11 21:30:15 2011 +0800

    Drop upstreamed lirc memleak and ampache unicode patches

diff --git a/debian/patches/0001-Lirc-Fix-warning-and-potential-memory-issues.patch b/debian/patches/0001-Lirc-Fix-warning-and-potential-memory-issues.patch
deleted file mode 100644
index 678c52c..0000000
--- a/debian/patches/0001-Lirc-Fix-warning-and-potential-memory-issues.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2854587dc3635d2fd2c17b42e1c007506f946502 Mon Sep 17 00:00:00 2001
-From: Chow Loong Jin <hyperair at ubuntu.com>
-Date: Sun, 20 Feb 2011 16:33:08 +0800
-Subject: [PATCH] [Lirc] Fix warning and potential memory issues
-
-Fix the following issues:-
- * Warning about control reaching the end of
-   lirc_glue_next_valid_command which has a non-void return value.
- * Leakage of lirc code in the same function if it yielded a NULL
-   command from lirc_code2char
- * Remove a free(command) that would only fire if command == NULL
----
- src/Lirc/lirc-glue/lirc-glue.c |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/Lirc/lirc-glue/lirc-glue.c b/src/Lirc/lirc-glue/lirc-glue.c
-index bdb7ef7..793836c 100644
---- a/src/Lirc/lirc-glue/lirc-glue.c
-+++ b/src/Lirc/lirc-glue/lirc-glue.c
-@@ -46,14 +46,15 @@ char *lirc_glue_next_valid_command ()
-         } else {
-             lirc_glue_set_error (1);  // means we don't have a code.  totally normal for other unrelated button presses
-         }
-+
-+        free (code);
-+
-         if (lirc_glue_get_error () < 1 ) {
--            free (code);
--            if (command != NULL)
--                return (command);
--            free (command);
--            return (NULL);
-+            return (command);
-         }
-     }
-+
-+    return (NULL); // daemon shut down so no next code
- }
- 
- struct lirc_config *lirc_glue_getconfig ()
--- 
-1.7.1
-
diff --git a/debian/patches/fix-ampache-unicode.patch b/debian/patches/fix-ampache-unicode.patch
deleted file mode 100644
index 7dfab95..0000000
--- a/debian/patches/fix-ampache-unicode.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: banshee-community-extensions.git/src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs
-===================================================================
---- banshee-community-extensions.git.orig/src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs	2010-12-23 16:01:22.000000000 +0000
-+++ banshee-community-extensions.git/src/Ampache/gtk-gui/Banshee.Ampache.PreferenceView.cs	2010-12-23 16:54:08.162029643 +0000
-@@ -47,7 +47,7 @@
- 			this.entPassword.Name = "entPassword";
- 			this.entPassword.IsEditable = true;
- 			this.entPassword.Visibility = false;
--			this.entPassword.InvisibleChar = '•';
-+			this.entPassword.InvisibleChar = '\u2022';
- 			this.table1.Add (this.entPassword);
- 			global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1[this.entPassword]));
- 			w1.TopAttach = ((uint)(2));
-@@ -60,7 +60,7 @@
- 			this.entUrl.CanFocus = true;
- 			this.entUrl.Name = "entUrl";
- 			this.entUrl.IsEditable = true;
--			this.entUrl.InvisibleChar = '•';
-+			this.entUrl.InvisibleChar = '\u2022';
- 			this.table1.Add (this.entUrl);
- 			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.entUrl]));
- 			w2.LeftAttach = ((uint)(1));
-@@ -71,7 +71,7 @@
- 			this.entUser.CanFocus = true;
- 			this.entUser.Name = "entUser";
- 			this.entUser.IsEditable = true;
--			this.entUser.InvisibleChar = '•';
-+			this.entUser.InvisibleChar = '\u2022';
- 			this.table1.Add (this.entUser);
- 			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.entUser]));
- 			w3.TopAttach = ((uint)(1));
diff --git a/debian/patches/series b/debian/patches/series
index 2f78b86..41d2436 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-fix-ampache-unicode.patch
-0001-Lirc-Fix-warning-and-potential-memory-issues.patch
 fsck-intltool.patch

-- 
banshee-community-extensions