[orca/gnome-3-14] Only use focused format type for objects which are not text block elements

[Joanmarie Diggs <joanied src gnome org>]

commit 5609f34181ef7294907088b02f5e5a3fe9b51f03
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Sun Sep 21 14:05:51 2014 -0400

    Only use focused format type for objects which are not text block elements

 src/orca/scripts/toolkits/Gecko/script.py          |    3 ++-
 .../scripts/toolkits/Gecko/speech_generator.py     |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 8fa64f9..3a24e86 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -2460,7 +2460,8 @@ class Script(default.Script):
         lastObj = None
         for content in contents:
             [obj, startOffset, endOffset, string] = content
-            if not self.utilities.justEnteredObject(obj, startOffset, endOffset):
+            if not self.utilities.justEnteredObject(obj, startOffset, endOffset) \
+               and not self.utilities.isTextBlockElement(obj):
                 formatType = 'focused'
             else:
                 formatType = 'unfocused'
diff --git a/src/orca/scripts/toolkits/Gecko/speech_generator.py 
b/src/orca/scripts/toolkits/Gecko/speech_generator.py
index 7ddad9a..4b2ce95 100644
--- a/src/orca/scripts/toolkits/Gecko/speech_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/speech_generator.py
@@ -205,7 +205,8 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
         start = args.get('startOffset')
         end = args.get('endOffset')
         if isinstance(start, int) and isinstance(end, int) \
-           and not self._script.utilities.justEnteredObject(obj, start, end):
+           and not self._script.utilities.justEnteredObject(obj, start, end) \
+           and not self._script.utilities.isTextBlockElement(obj):
             return []
 
         # Saying "menu item" for a combo box can confuse users. Therefore,