Index: src/orca/default.py
===================================================================
--- src/orca/default.py	(revision 3231)
+++ src/orca/default.py	(working copy)
@@ -161,7 +161,7 @@
 
         self.inputEventHandlers["whereAmIHandler"] = \
             input_event.InputEventHandler(
-                Script.doWhereAmI,
+                Script.getWhereAmIInfo,
                 # Translators: the "Where am I" feature of Orca allows
                 # a user to press a key and then have information
                 # about their current context spoken and brailled to
@@ -171,6 +171,16 @@
                 #
                 _("Performs the where am I operation."))
 
+        self.inputEventHandlers["getTitleOrStatusHandler"] = \
+            input_event.InputEventHandler(
+                Script.getTitleOrStatus,
+                # Translators: Orca has a command that will speak
+                # a window's title if pressed once.  If pressed
+                # two times quickly the contents of the status bar
+                # will be spoken instead.
+                #
+                _("Speaks the title bar or status bar."))
+
         self.inputEventHandlers["findHandler"] = \
             input_event.InputEventHandler(
                 orca._showFindGUI,
@@ -823,12 +833,19 @@
         keyBindings.add(
             keybindings.KeyBinding(
                 "KP_Enter",
+                orcaModMask,
                 0,
-                0,
                 self.inputEventHandlers["whereAmIHandler"]))
 
         keyBindings.add(
             keybindings.KeyBinding(
+                "KP_Enter",
+                orcaModMask,
+                orcaModMask,
+                self.inputEventHandlers["getTitleOrStatusHandler"]))
+
+        keyBindings.add(
+            keybindings.KeyBinding(
                 "KP_Delete",
                 orcaModMask,
                 0,
@@ -1110,7 +1127,7 @@
                 "slash",
                 orcaModMask,
                 orcaModMask,
-                self.inputEventHandlers["whereAmIHandler"]))
+                self.inputEventHandlers["getTitleOrStatusHandler"]))
 
         keyBindings.add(
             keybindings.KeyBinding(
@@ -1906,34 +1923,36 @@
             braille.displayMessage(text)
             speech.speak(text)
 
-    def doWhereAmI(self, inputEvent):
+    def doWhereAmI(self, inputEvent, statusOrTitle):
+        """Peforms the whereAmI operation.
+
+        Arguments:
+        - inputEvent:     The original inputEvent
+        - titleOrStatus:  If true, the user is interested in the window's
+                          title or status bar.
         """
-        Speaks information about the current object of interest.
-        """
+
         obj = orca_state.locusOfFocus
         self.updateBraille(obj)
 
-        if inputEvent and orca_state.lastInputEvent \
-           and isinstance(orca_state.lastInputEvent, input_event.KeyboardEvent):
-            keyString = input_event.keyEventToString(inputEvent)
-            debug.println(debug.LEVEL_FINEST, "default.doWhereAmI: %s" \
-                          % keyString)
-        else:
-            return self.whereAmI.whereAmI(obj, False, False)
-
-        orcaKey = False
-        if settings.keyboardLayout == settings.GENERAL_KEYBOARD_LAYOUT_DESKTOP:
-            orcaKey = (inputEvent.modifiers & (1 << settings.MODIFIER_ORCA)) \
-                        == (1 << settings.MODIFIER_ORCA)
-        else:
-            orcaKey = (inputEvent.event_string == "/")
-
         clickCount = self.getClickCount(self.lastWhereAmIEvent, inputEvent)
         doubleClick = clickCount == 2
         self.lastWhereAmIEvent = inputEvent
 
-        return self.whereAmI.whereAmI(obj, doubleClick, orcaKey)
+        return self.whereAmI.whereAmI(obj, doubleClick, statusOrTitle)
 
+    def getWhereAmIInfo(self, inputEvent):
+        """Speaks information about the current object of interest."""
+
+        self.doWhereAmI(inputEvent, False)
+
+    def getTitleOrStatus(self, inputEvent):
+        """Speaks the window title for a single click; speaks the contents
+        of the status bar for a double click.
+        """
+
+        self.doWhereAmI(inputEvent, True)
+
     def findCommonAncestor(self, a, b):
         """Finds the common ancestor between Accessible a and Accessible b.
 
Index: src/orca/Gecko.py
===================================================================
--- src/orca/Gecko.py	(revision 3231)
+++ src/orca/Gecko.py	(working copy)
@@ -1328,13 +1328,13 @@
         where_am_I.WhereAmI.__init__(self, script)
         self._script = script
         
-    def whereAmI(self, obj, doubleClick, orcaKey):
+    def whereAmI(self, obj, doubleClick, statusOrTitle):
         """Calls the base class method for single clicks and Gecko specific
         information presentation methods for double clicks
         """
-        if not doubleClick or orcaKey \
+        if not doubleClick or statusOrTitle \
            or not self._script.inDocumentContent(obj):
-            where_am_I.WhereAmI.whereAmI(self, obj, doubleClick, orcaKey)
+            where_am_I.WhereAmI.whereAmI(self, obj, doubleClick, statusOrTitle)
         else:
             try:
                 self._collectionPageSummary()
Index: src/orca/where_am_I.py
===================================================================
--- src/orca/where_am_I.py	(revision 3231)
+++ src/orca/where_am_I.py	(working copy)
@@ -50,7 +50,7 @@
         self._defaultButton = None
         self._lastAttributeString = ""
 
-    def whereAmI(self, obj, doubleClick, orcaKey):
+    def whereAmI(self, obj, doubleClick, titleOrStatus):
         """Speaks information about the current object of interest, including
         the object itself, which window it is in, which application, which
         workspace, etc.
@@ -75,7 +75,7 @@
            \n  parent name=%s \
            \n  parent role=%s \
            \n  double-click=%s \
-           \n  orca-key=%s" % \
+           \n  titleOrStatus=%s" % \
             (self._getObjLabel(obj),
              self._getObjName(obj),
              obj.getRoleName(),
@@ -84,12 +84,12 @@
              self._getObjName(obj.parent),
              obj.parent.getRoleName(),
              doubleClick,
-             orcaKey))
+             titleOrStatus))
 
         role = obj.getRole()
 
-        if orcaKey:
-            self._processOrcaKey(obj, doubleClick)
+        if titleOrStatus:
+            self._speakTitleOrStatus(obj, doubleClick)
 
         elif role == pyatspi.ROLE_CHECK_BOX:
             self._speakCheckBox(obj, doubleClick)
@@ -142,12 +142,6 @@
 
         return True
 
-    def _processOrcaKey(self, obj, doubleClick):
-        """Test to see if the Orca modifier key has been pressed.
-        """
-
-        self._handleOrcaKey(obj, doubleClick)
-
     def _speakCheckBox(self, obj, doubleClick):
         """Checkboxes present the following information
         (an example is 'Enable speech, checkbox checked, Alt E'):
@@ -1406,17 +1400,17 @@
 
         return newStr
 
-    def _handleOrcaKey(self, obj, doubleClick):
-        """Handle the Orca modifier key being pressed.
+    def _speakTitleOrStatus(self, obj, doubleClick):
+        """When pressed a single time, Orca will speak the following
+        information:
 
-        When Insert + KP_Enter is pressed a single time, Orca will speak
-        and display the following information:
-
         1. The contents of the title bar of the application main window
         2. If in a dialog box within an application, the contents of the
         title bar of the dialog box.
         3. Orca will pause briefly between these two pieces of information
         so that the speech user can distinguish each.
+
+        If pressed twice, Orca will speak the status bar.
         """
 
         utterances = []
