[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/oneiric, updated. debian/2.2.1-1ubuntu1-2-g23d8919

[Chow Loong Jin]

The following commit has been merged in the ubuntu/oneiric branch:
commit 8217e74e0b7306811e2fbdd07ae9e7e8fb3992c3
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sun Nov 13 02:21:23 2011 +0800

    Add workaround for set_Height exceptions in Hyena
    
    LP: #873787
    Thanks: Andrés G. Aragoneses <knocte at gmail.com>

diff --git a/debian/patches/series b/debian/patches/series
index 39f04f5..aa0a1e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,5 @@
 workaround-clideps-winmm.patch
 workaround-clideps-meego.patch
 0001-libbanshee-Remove-unused-wanted_size-variable.patch
+set_Height-workaround.patch
 99_ltmain_as-needed.patch
diff --git a/debian/patches/set_Height-workaround.patch b/debian/patches/set_Height-workaround.patch
new file mode 100644
index 0000000..f23020c
--- /dev/null
+++ b/debian/patches/set_Height-workaround.patch
@@ -0,0 +1,30 @@
+Description: Workaround for set_Height exceptions
+From: Andrés G. Aragoneses <knocte at gmail.com>
+Reviewed-By: Chow Loong Jin <hyperair at ubuntu.com>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=624976
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/873787
+
+Index: banshee/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Rect.cs
+===================================================================
+--- banshee.orig/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Rect.cs	2011-11-13 02:40:56.242285823 +0800
++++ banshee/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Rect.cs	2011-11-13 02:48:27.304868318 +0800
+@@ -81,7 +81,8 @@
+             get { return w; }
+             set {
+                 if (value < 0) {
+-                    throw new ArgumentException ();
++                    Log.Warning (String.Format ("Tried to set an invalid width of {0} {1}", value, System.Environment.StackTrace));
++                    value = 0;
+                 }
+ 
+                 w = value;
+@@ -92,7 +93,8 @@
+             get { return h; }
+             set {
+                 if (value < 0) {
+-                    throw new ArgumentException ();
++                    Log.Warning (String.Format ("Tried to set an invalid height of {0}: {1}", value, System.Environment.StackTrace));
++                    value = 0;
+                 }
+ 
+                 h = value;

-- 
banshee