[orca] Fix for bug 652415 - gksu grab can be disabled via gksu-properties; Orca doesn't need this option in



commit 2e1849c6aa70cc04572eeb363c430c20f00178cd
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sun Jun 12 20:21:57 2011 -0400

    Fix for bug 652415 - gksu grab can be disabled via gksu-properties; Orca doesn't need this option in its GUI

 src/orca/orca-setup.ui     |   16 ----------------
 src/orca/orca_gui_prefs.py |   19 -------------------
 src/orca/settings.py       |   16 ----------------
 3 files changed, 0 insertions(+), 51 deletions(-)
---
diff --git a/src/orca/orca-setup.ui b/src/orca/orca-setup.ui
index e36fc91..5e2a6d9 100644
--- a/src/orca/orca-setup.ui
+++ b/src/orca/orca-setup.ui
@@ -373,22 +373,6 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="disableKeyGrabCheckButton">
-                        <property name="label" translatable="yes">Disable gksu _keyboard grab</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="disableKeyGrabChecked"/>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
                       <object class="GtkCheckButton" id="presentToolTipsCheckButton">
                         <property name="label" translatable="yes">_Present tooltips</property>
                         <property name="visible">True</property>
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 7517ea6..2a2244a 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -1768,10 +1768,6 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
             prefs["presentToolTips"] \
                 and _settingsManager.getSetting('canPresentToolTips'))
 
-        self.disableKeyGrabPref = settings.isGKSUGrabDisabled()
-        self.get_widget("disableKeyGrabCheckButton").set_active( \
-                        self.disableKeyGrabPref)
-
         if prefs["keyboardLayout"] == settings.GENERAL_KEYBOARD_LAYOUT_DESKTOP:
             self.get_widget("generalDesktopButton").set_active(True)
         else:
@@ -3042,19 +3038,6 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
             widget.get_active() \
             and _settingsManager.getSetting('canPresentToolTips')
 
-    def disableKeyGrabChecked(self, widget):
-        """Signal handler for the "toggled" signal for the
-           disableKeyGrabCheckButton GtkCheckButton widget.
-           The user has [un]checked the 'Disable gksu keyboard grab'
-           checkbox. Set the gconf '/apps/gksu/disable-grab' resource
-           to the new value.
-
-        Arguments:
-        - widget: the component that generated the signal.
-        """
-
-        self.disableKeyGrabPref = widget.get_active()
-
     def keyboardLayoutChanged(self, widget):
         """Signal handler for the "toggled" signal for the generalDesktopButton,
            or generalLaptopButton GtkRadioButton widgets. The user has
@@ -3307,8 +3290,6 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
                 settings.SYSTEM_VOICE    : acss.ACSS(self.systemVoice),
             }
 
-        settings.setGKSUGrabDisabled(self.disableKeyGrabPref)
-
     def applyButtonClicked(self, widget):
         """Signal handler for the "clicked" signal for the applyButton
            GtkButton widget. The user has clicked the Apply button.
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 9382c74..dbe8b83 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -921,22 +921,6 @@ chatAnnounceBuddyTyping = False
 #
 chatRoomHistories = False
 
-# Obtain/set information regarding whether the gksu keyboard grab is enabled
-# or not.
-#
-def isGKSUGrabDisabled():
-    try:
-        return gconfClient.get_bool("/apps/gksu/disable-grab")
-    except:
-        return False
-
-def setGKSUGrabDisabled(disable):
-    try:
-        return gconfClient.set_bool("/apps/gksu/disable-grab",
-                                    disable)
-    except:
-        return False
-
 # Allow for the customization of key bindings.
 #
 def overrideKeyBindings(script, keyBindings):



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