orca r3913 - in trunk: . src/orca

[richb svn gnome org]

Author: richb
Date: Wed May 21 21:58:56 2008
New Revision: 3913
URL: http://svn.gnome.org/viewvc/orca?rev=3913&view=rev

Log:
        * src/orca/orca_gui_prefs.py:
          Further tweak for bug #448817. If we are pressing Apply or OK
          from an application preferences dialog (rather than the general
          Orca preferences), then there won't be a general pane, so we
          won't be able to adjust the login checkbox. Just catch the
          failure and carry on.


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

Modified: trunk/src/orca/orca_gui_prefs.py
==============================================================================
--- trunk/src/orca/orca_gui_prefs.py	(original)
+++ trunk/src/orca/orca_gui_prefs.py	Wed May 21 21:58:56 2008
@@ -3853,8 +3853,16 @@
 
         settings.setGKSUGrabDisabled(self.disableKeyGrabPref)
 
-        status = settings.setOrcaAutostart(self.enableAutostart)
-        self.get_widget("autostartOrcaCheckbutton").set_active(status)
+        try:
+            status = settings.setOrcaAutostart(self.enableAutostart)
+            self.get_widget("autostartOrcaCheckbutton").set_active(status)
+        except:
+            # If we are pressing Apply or OK from an application preferences
+            # dialog (rather than the general Orca preferences), then there
+            # won't be a general pane, so we won't be able to adjust this
+            # checkbox.
+            #
+            pass
 
         self.writeUserPreferences()