[Pkg-cli-apps-commits] [SCM] docky branch, master, updated. debian/2.0.3.1-1-6-gc51ac71

[Iain Lane]

The following commit has been merged in the master branch:
commit 2f97a2eccf3796137c941c9b81ba3f8967be53c2
Author: Iain Lane <laney at ubuntu.com>
Date:   Fri May 14 09:35:29 2010 +0100

    Add patch to fix mail label crash bug
    
    * debian/patches/mail_label_crash: Add patch cherrypicked from upstream to
      fix a crash bug when deleting mail labels

diff --git a/debian/changelog b/debian/changelog
index e1ea6da..ed47626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+docky (2.0.3.1-2) UNRELEASED; urgency=low
+
+  * debian/patches/mail_label_crash: Add patch cherrypicked from upstream to
+    fix a crash bug when deleting mail labels
+
+ -- Iain Lane <laney at ubuntu.com>  Fri, 14 May 2010 09:32:56 +0100
+
 docky (2.0.3.1-1) unstable; urgency=low
 
   * New upstream release 2.0.3.1 "You should have heard from us by now",
diff --git a/debian/patches/mail_label_crash b/debian/patches/mail_label_crash
new file mode 100644
index 0000000..c0787a6
--- /dev/null
+++ b/debian/patches/mail_label_crash
@@ -0,0 +1,41 @@
+Description: Fix "Deleting label in mail applet causes docky to crash"
+Origin: upstream, commit: 1327
+Bug-Upstream: https://bugs.launchpad.net/docky/+bug/576596
+
+=== modified file 'Docky.Widgets/Docky.Widgets/ListOnlyTileView.cs'
+Index: docky.git/Docky.Widgets/Docky.Widgets/ListOnlyTileView.cs
+===================================================================
+--- docky.git.orig/Docky.Widgets/Docky.Widgets/ListOnlyTileView.cs	2010-05-14 09:10:13.976709841 +0100
++++ docky.git/Docky.Widgets/Docky.Widgets/ListOnlyTileView.cs	2010-05-14 09:11:10.196709296 +0100
+@@ -36,11 +36,11 @@
+ 		
+ 		public override void OnTileActiveChanged (object o, EventArgs args)
+ 		{
++			base.OnTileActiveChanged (o, args);
++			
+ 			Tile t = o as Tile;
+ 			
+ 			RemoveTile (t.OwnedObject);
+-			
+-			base.OnTileActiveChanged (o, args);
+ 		}
+ 	}
+ }
+Index: docky.git/Docky.Widgets/Docky.Widgets/TileView.cs
+===================================================================
+--- docky.git.orig/Docky.Widgets/Docky.Widgets/TileView.cs	2010-05-14 09:10:14.056708576 +0100
++++ docky.git/Docky.Widgets/Docky.Widgets/TileView.cs	2010-05-14 09:11:10.206719952 +0100
+@@ -125,11 +125,11 @@
+ 			tile.ActiveChanged -= OnTileActiveChanged;
+ 			tile.SizeAllocated -= OnTileSizeAllocated;
+ 			tile.Owner = null;
+-			tile.Dispose ();
+-			tile.Destroy ();
+ 			
+ 			tiles.Remove (tile);
+ 			box.Remove (tile);
++			tile.Dispose ();
++			tile.Destroy ();
+ 		}
+ 		
+ 		public virtual void ClearSelection ()
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..f04545e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+mail_label_crash

-- 
docky