[orca/new-settings] Added detection of the activeProfile at the begining of the Orca loading



commit b6c1703babce0c28d130bdcd4fbc42ecc6058316
Author: Juanje Ojeda <jojeda emergya es>
Date:   Wed Oct 27 18:31:12 2010 +0200

    Added detection of the activeProfile at the begining of the Orca loading

 src/orca/orca.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 8dec320..42dc565 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -1132,8 +1132,9 @@ def loadUserSettings(script=None, inputEvent=None):
 
     reloaded = False
     if _userSettings:
+        _profile = _userSettings.get('activeProfile')[1]
         try:
-            _userSettings = _settingsManager.getGeneralSettings()
+            _userSettings = _settingsManager.getGeneralSettings(_profile)
             reloaded = True
         except ImportError:
             debug.printException(debug.LEVEL_FINEST)
@@ -1141,7 +1142,10 @@ def loadUserSettings(script=None, inputEvent=None):
             debug.printException(debug.LEVEL_SEVERE)
     else:
         try:
+            #TODO: Temporal hack, we need to get it right
             _userSettings = _settingsManager.getGeneralSettings()
+            _profile = _userSettings.get('activeProfile')[1]
+            _userSettings = _settingsManager.getGeneralSettings(_profile)
             if _debugSwitch:
                 debug.debugLevel = debug.LEVEL_ALL
                 debug.eventDebugLevel = debug.LEVEL_OFF



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]