orca r3756 - in trunk: . src/orca

[eitani svn gnome org]

Author: eitani
Date: Wed Mar 26 04:30:08 2008
New Revision: 3756
URL: http://svn.gnome.org/viewvc/orca?rev=3756&view=rev

Log:
* src/orca/braille.py:
  Fixed a bad regression from the previous patch
  (bug #523268, comment #7).


Modified:
   trunk/ChangeLog
   trunk/src/orca/braille.py

Modified: trunk/src/orca/braille.py
==============================================================================
--- trunk/src/orca/braille.py	(original)
+++ trunk/src/orca/braille.py	Wed Mar 26 04:30:08 2008
@@ -554,7 +554,7 @@
 
         # Start with an empty mask.
         #
-        stringLength = len(self.string) - len(self.eol)
+        stringLength = len(self.rawLine) - len(self.label)
         lineEndOffset = self.lineOffset + stringLength
         regionMask = [settings.TEXT_ATTR_BRAILLE_NONE]*stringLength
 
@@ -613,7 +613,11 @@
 
 
         if self.label:
+<<<<<<< HEAD:src/orca/braille.py
             regionMask = [0]*len(self.label) + mask
+=======
+            regionMask = [0]*len(self.label) + regionMask
+>>>>>>> brl_attributes_cleanup:src/orca/braille.py
 
         return ''.join(map(chr, regionMask))