meld r1078 - trunk

[kaiw svn gnome org]

Author: kaiw
Date: Wed Oct 22 17:48:30 2008
New Revision: 1078
URL: http://svn.gnome.org/viewvc/meld?rev=1078&view=rev

Log:
Bug 557366 â Remove MASK_ALT as it isn't used, and it incorrectly masks Shift and Ctrl.

Modified:
   trunk/filediff.py

Modified: trunk/filediff.py
==============================================================================
--- trunk/filediff.py	(original)
+++ trunk/filediff.py	Wed Oct 22 17:48:30 2008
@@ -66,7 +66,7 @@
 #
 ################################################################################
 
-MASK_SHIFT, MASK_CTRL, MASK_ALT = 1, 2, 3
+MASK_SHIFT, MASK_CTRL = 1, 2
 
 class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
     """Two or three way diff of text files.
@@ -74,10 +74,8 @@
 
     keylookup = {gtk.keysyms.Shift_L : MASK_SHIFT,
                  gtk.keysyms.Control_L : MASK_CTRL,
-                 gtk.keysyms.Alt_L : MASK_ALT,
                  gtk.keysyms.Shift_R : MASK_SHIFT,
-                 gtk.keysyms.Control_R : MASK_CTRL,
-                 gtk.keysyms.Alt_R : MASK_ALT }
+                 gtk.keysyms.Control_R : MASK_CTRL}
 
     def __init__(self, prefs, num_panes):
         """Start up an filediff with num_panes empty contents.