[orca/new-settings] Apply a change that was made in master to the new-settings branch.

[Joanmarie Diggs <joanied src gnome org>]

commit a0b85af397e2fcabb7d0f65d5debdc1d49e51919
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Oct 18 21:31:20 2010 -0400

    Apply a change that was made in master to the new-settings branch.
    
    This is a partial fix for the bug where we are failing to set the
    Orca modifier(s) correctly. It was a change made to master back
    when the Orca modifier widget went from being read-only text to
    a combo box. This fix solves the problem for the Classic backend.
    An additional change will be needed for the gconf backend.

 src/orca/backends/classic.py       |    5 +----
 src/orca/backends/gconf_backend.py |    5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/src/orca/backends/classic.py b/src/orca/backends/classic.py
index 7c54f84..7c081e8 100644
--- a/src/orca/backends/classic.py
+++ b/src/orca/backends/classic.py
@@ -230,10 +230,7 @@ class OrcaPrefs:
     def _getOrcaModifierKeysString(self, orcaModifierKeys):
         """Returns a string that represents the Orca modifier keys passed in."""
 
-        if orcaModifierKeys == settings.DESKTOP_MODIFIER_KEYS:
-            return "orca.settings.DESKTOP_MODIFIER_KEYS"
-        else:
-            return "orca.settings.LAPTOP_MODIFIER_KEYS"
+        return "%s" % orcaModifierKeys
 
     def _getSpokenTextAttributesString(self, enabledSpokenTextAttributes):
         """ Returns a string that represents the enabled spoken text attributes 
diff --git a/src/orca/backends/gconf_backend.py b/src/orca/backends/gconf_backend.py
index 07ce6a4..576654d 100644
--- a/src/orca/backends/gconf_backend.py
+++ b/src/orca/backends/gconf_backend.py
@@ -300,10 +300,7 @@ class OrcaPrefs():
     def _getOrcaModifierKeysString(self, orcaModifierKeys):
         """Returns a string that represents the Orca modifier keys passed in."""
 
-        if orcaModifierKeys == settings.DESKTOP_MODIFIER_KEYS:
-            return "orca.settings.DESKTOP_MODIFIER_KEYS"
-        else:
-            return "orca.settings.LAPTOP_MODIFIER_KEYS"
+        return "%s" % orcaModifierKeys
 
     def _getSpokenTextAttributesString(self, enabledSpokenTextAttributes):
         """ Returns a string that represents the enabled spoken text attributes