[Pkg-cli-apps-commits] [SCM] pinta branch, master, updated. debian/0.4+dfsg-2-10-g4f7809e

[Jo Shields]

The following commit has been merged in the master branch:
commit b9801a9646195fd0528091e184cb14be2997c5a6
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Nov 2 20:53:53 2010 +0000

    Remove osbolete patch

diff --git a/debian/patches/series b/debian/patches/series
index 402959b..d2942e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-tools_exceptions_and_history_corruption.patch
 tool_toolbar_fixed_size.patch
diff --git a/debian/patches/tools_exceptions_and_history_corruption.patch b/debian/patches/tools_exceptions_and_history_corruption.patch
deleted file mode 100644
index f1ea8c7..0000000
--- a/debian/patches/tools_exceptions_and_history_corruption.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Fix exceptions and data loss when clicking two mouse buttons while drawing
- Fixes exceptions and history corruption that can occur when clicking two
- mouse buttons at once with the gradient and selection tools.
-Bug: https://launchpad.net/bugs/599468
-Origin: upstream, http://github.com/jpobst/Pinta/commit/1578683a943f367e3725f1f431855d765e5de3bd
-Author: Maia Kozheva <sikon at ubuntu.com>
-–––
-diff --git a/Pinta.Tools/SelectTool.cs b/Pinta.Tools/SelectTool.cs
-index 2d33808..b2496ea 100644
---- a/Pinta.Tools/SelectTool.cs
-+++ b/Pinta.Tools/SelectTool.cs
-@@ -46,6 +46,10 @@ namespace Pinta.Tools
- 		#region Mouse Handlers
- 		protected override void OnMouseDown (DrawingArea canvas, ButtonPressEventArgs args, Cairo.PointD point)
- 		{
-+			// Ignore extra button clicks while drawing
-+			if (is_drawing)
-+				return;
-+		
- 			shape_origin = point;
- 			is_drawing = true;
- 			
-diff --git a/Pinta.Tools/GradientTool.cs b/Pinta.Tools/GradientTool.cs
-index c7e3d3a..824696e 100644
---- a/Pinta.Tools/GradientTool.cs
-+++ b/Pinta.Tools/GradientTool.cs
-@@ -67,6 +67,10 @@ namespace Pinta.Tools
- 		#region mouse
- 		protected override void OnMouseDown (Gtk.DrawingArea canvas, Gtk.ButtonPressEventArgs args, Cairo.PointD point)
- 		{
-+			// Protect against history corruption
-+			if (tracking)
-+				return;
-+		
- 			base.OnMouseDown (canvas, args, point);
- 			startpoint = point;
- 			tracking = true;
-@@ -76,6 +80,9 @@ namespace Pinta.Tools
- 
- 		protected override void OnMouseUp (Gtk.DrawingArea canvas, Gtk.ButtonReleaseEventArgs args, Cairo.PointD point)
- 		{
-+			if (!tracking || args.Event.Button != button)
-+				return;
-+		
- 			base.OnMouseUp (canvas, args, point);
- 			tracking = false;
- 			PintaCore.History.PushNewItem (new SimpleHistoryItem (Icon, Name, undo_surface, PintaCore.Layers.CurrentLayerIndex));

-- 
pinta