[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/1.9.0-1-10-g93a69ad

[Iain Lane]

The following commit has been merged in the experimental branch:
commit d7e9689e156a9acc07bb6357f22093876c2c21f2
Author: Iain Lane <laney at ubuntu.com>
Date:   Sun Dec 19 18:02:54 2010 +0000

    Cherry-pick upstream commit to fix issue with YOptions in SimpleTable
    
    Add commit dd5de0988e14e0da67441044dea339eb7ac3a615 taken from
    upstream (Hyena) git, to resolve a crash when connecting digital audio
    players.

diff --git a/debian/patches/09_Fix-issue-with-YOptions-in-SimpleTable.patch b/debian/patches/09_Fix-issue-with-YOptions-in-SimpleTable.patch
new file mode 100644
index 0000000..3c35987
--- /dev/null
+++ b/debian/patches/09_Fix-issue-with-YOptions-in-SimpleTable.patch
@@ -0,0 +1,64 @@
+From dd5de0988e14e0da67441044dea339eb7ac3a615 Mon Sep 17 00:00:00 2001
+From: Gabriel Burt <gabriel.burt at gmail.com>
+Date: Thu, 16 Dec 2010 19:18:29 +0000
+Subject: [Hyena.Gui] Fix issue with YOptions in SimpleTable
+
+---
+Index: banshee.git/src/Hyena/Hyena.Gui/Hyena.Widgets/SimpleTable.cs
+===================================================================
+--- banshee.git.orig/src/Hyena/Hyena.Gui/Hyena.Widgets/SimpleTable.cs	2010-12-19 17:57:15.928165427 +0000
++++ banshee.git/src/Hyena/Hyena.Gui/Hyena.Widgets/SimpleTable.cs	2010-12-19 18:00:49.624675350 +0000
+@@ -38,6 +38,7 @@
+ 
+         private List<T> items = new List<T> ();
+         private Dictionary<T, Widget []> item_widgets = new Dictionary<T, Widget []> ();
++        private AttachOptions default_options = AttachOptions.Fill | AttachOptions.Expand;
+ 
+         public SimpleTable () : this (2) {}
+ 
+@@ -47,7 +48,9 @@
+             RowSpacing = 5;
+ 
+             XOptions = new AttachOptions [n_columns];
+-            YOptions = new AttachOptions [n_columns];
++            for (int i = 0; i < n_columns; i++) {
++                XOptions[i] = default_options;
++            }
+         }
+ 
+         public void AddRow (T item, params Widget [] cols)
+@@ -56,7 +59,6 @@
+         }
+ 
+         public AttachOptions [] XOptions { get; private set; }
+-        public AttachOptions [] YOptions { get; private set; }
+ 
+         public void InsertRow (T item, uint row, params Widget [] cols)
+         {
+@@ -72,7 +74,7 @@
+                 for (uint x = 0; x < NColumns; x++) {
+                     var widget = item_widgets[items[y]][x];
+                     Remove (widget);
+-                    Attach (widget, x, x + 1, (uint) y + 1, (uint) y + 2, XOptions[x], YOptions[y], 0, 0);
++                    Attach (widget, x, x + 1, (uint) y + 1, (uint) y + 2, XOptions[x], default_options, 0, 0);
+                 }
+             }
+ 
+@@ -80,7 +82,7 @@
+             item_widgets[item] = cols;
+ 
+             for (uint x = 0; x < NColumns; x++) {
+-                Attach (cols[x], x, x + 1, row, row + 1, XOptions[x], YOptions[row], 0, 0);
++                Attach (cols[x], x, x + 1, row, row + 1, XOptions[x], default_options, 0, 0);
+             }
+         }
+ 
+@@ -97,7 +99,7 @@
+                 for (uint x = 0; x < NColumns; x++) {
+                     var widget = item_widgets[items[y]][x];
+                     Remove (widget);
+-                    Attach (widget, x, x + 1, (uint) y - 1, (uint) y, XOptions[x], YOptions[y], 0, 0);
++                    Attach (widget, x, x + 1, (uint) y - 1, (uint) y, XOptions[x], default_options, 0, 0);
+                 }
+             }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index bf67a79..c12efba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,7 @@
 07_enable-library-watch-by-default.patch
 07_enable-mpris-by-default.patch
 08_remove_unrelevant_media.patch
+09_Fix-issue-with-YOptions-in-SimpleTable.patch
 0001-Don-t-copy-duplicate-libraries.patch
 0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
 99_ltmain_as-needed.patch

-- 
banshee