rpms/mirage/F-12 mirage-0.9.3-prevmouse-not-defined-with-click.patch, NONE, 1.1 mirage.spec, 1.19, 1.20

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/mirage/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15732/F-12

Modified Files:
	mirage.spec 
Added Files:
	mirage-0.9.3-prevmouse-not-defined-with-click.patch 
Log Message:
* Fri Jan 29 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.3-5
- Fix bt when clicking middle button in some case (bug 559853)


mirage-0.9.3-prevmouse-not-defined-with-click.patch:
 mirage.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE mirage-0.9.3-prevmouse-not-defined-with-click.patch ---
--- mirage-0.9.3/mirage.py.debug	2008-03-27 13:05:28.000000000 +0900
+++ mirage-0.9.3/mirage.py	2010-01-29 18:19:24.000000000 +0900
@@ -2946,10 +2946,11 @@
 	def button_pressed(self, widget, event):
 		if self.image_loaded:
 			# Changes the cursor to the 'resize' cursor, like GIMP, on a middle click:
-			if (event.button == 2 or event.button == 1) and (self.hscroll.get_property('visible')==True or self.vscroll.get_property('visible')==True):
-				self.change_cursor(gtk.gdk.Cursor(gtk.gdk.FLEUR))
+			if (event.button == 2 or event.button == 1) :
 				self.prevmousex = event.x_root
 				self.prevmousey = event.y_root
+				if (self.hscroll.get_property('visible')==True or self.vscroll.get_property('visible')==True) :
+					self.change_cursor(gtk.gdk.Cursor(gtk.gdk.FLEUR))
 			# Right-click popup:
 			elif self.image_loaded and event.button == 3:
 				self.UIManager.get_widget('/Popup').popup(None, None, None, event.button, event.time)


Index: mirage.spec
===================================================================
RCS file: /cvs/extras/rpms/mirage/F-12/mirage.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- mirage.spec	24 Jul 2009 18:59:27 -0000	1.19
+++ mirage.spec	29 Jan 2010 09:36:00 -0000	1.20
@@ -2,13 +2,16 @@
 
 Name:		mirage
 Version:	0.9.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A fast and simple image viewer
 
 Group:		Amusements/Graphics
 License:	GPLv3+
 URL:		http://mirageiv.berlios.de/
 Source0:	http://download.berlios.de/mirageiv/%{name}-%{version}.tar.bz2
+# Fix bug 559853, backtrace when clicking middle button in some case
+# Must be sent to upstream
+Patch0:		mirage-0.9.3-prevmouse-not-defined-with-click.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext
@@ -25,6 +28,7 @@ keep their computers lean while still ha
 
 %prep
 %setup -q
+%patch0 -p1 -b .bt_prevmouse
 # Don't remove rebuilt files!
 %{__sed} -i.build -e '/Cleanup/,$d' setup.py
 
@@ -80,6 +84,9 @@ desktop-file-install \
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Fri Jan 29 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.3-5
+- Fix bt when clicking middle button in some case (bug 559853)
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.9.3-4
 - F-12: Mass rebuild