Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2360)
+++ ChangeLog	(working copy)
@@ -1,3 +1,13 @@
+2007-05-08  Rich Burridge <rich.burridge@sun.com>
+
+        * src/orca/orca_gui_prefs.py:
+          src/orca/settings.py:
+          src/orca/orca-setup.glade:
+          Fixed bug #368640 – Allow user to optionally ignore or be 
+          notified of tool tips. There is now a "Present Tooltips"
+          checkbox available on the General pane of the Orca Preferences
+          dialog that allows the user to un/set this feature.
+
 2007-05-08  Willie Walker <william.walker@sun.com>
 
         * src/orca/scripts/gnome-panel.py, src/orca/rolenames.py,
Index: src/orca/settings.py
===================================================================
--- src/orca/settings.py	(revision 2360)
+++ src/orca/settings.py	(working copy)
@@ -36,7 +36,7 @@
 
 # Whether tool tips can be presented.
 #
-presentToolTips = False
+canPresentToolTips = False
 
 try:
     # This can fail due to gtk not being available.  We want to
@@ -67,7 +67,7 @@
     current_gtk_version  = (100000 * gtk.gtk_version[0]) + \
                            (1000 * gtk.gtk_version[1]) + \
                             gtk.gtk_version[2]
-    presentToolTips = (current_gtk_version >= minimum_gtk_version)
+    canPresentToolTips = (current_gtk_version >= minimum_gtk_version)
 except:
     pass
 
@@ -125,6 +125,7 @@
     "verbalizePunctuationStyle",
     "showMainWindow",
     "quitOrcaNoConfirmation",
+    "presentToolTips",
     "sayAllStyle",
     "keyboardLayout",
     "speakBlankLines",
@@ -372,6 +373,10 @@
 #
 quitOrcaNoConfirmation  = False
 
+# Whether the user wants tooltips presented or not.
+#
+presentToolTips = False and canPresentToolTips
+
 # Keyboard layout options (see keyboardLayout).
 #
 GENERAL_KEYBOARD_LAYOUT_DESKTOP = 1
Index: src/orca/orca-setup.glade
===================================================================
--- src/orca/orca-setup.glade	(revision 2360)
+++ src/orca/orca-setup.glade	(working copy)
@@ -280,6 +280,26 @@
 		      <property name="fill">False</property>
 		    </packing>
 		  </child>
+
+		  <child>
+		    <widget class="GtkCheckButton" id="presentTooltipsCheckButton">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">_Present tooltips</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		      <signal name="toggled" handler="presentTooltipsChecked" last_modification_time="Wed, 09 May 2007 00:18:20 GMT"/>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="tab_expand">False</property>
Index: src/orca/orca_gui_prefs.py
===================================================================
--- src/orca/orca_gui_prefs.py	(revision 2360)
+++ src/orca/orca_gui_prefs.py	(working copy)
@@ -984,6 +984,8 @@
         #
         self.showMainWindowCheckButton.set_active(prefs["showMainWindow"])
         self.confirmQuitCheckButton.set_active(prefs["quitOrcaNoConfirmation"])
+        self.presentTooltipsCheckButton.set_active( \
+            prefs["presentToolTips"] and settings.canPresentToolTips)
 
         self.disableKeyGrabPref = settings.isGKSUGrabDisabled()
         self.disableKeyGrabCheckButton.set_active(self.disableKeyGrabPref)
@@ -2055,6 +2057,20 @@
 
         self.prefsDict["quitOrcaNoConfirmation"] = widget.get_active()
 
+    def presentTooltipsChecked(self, widget):
+        """Signal handler for the "toggled" signal for the
+           presentTooltipsCheckButton GtkCheckButton widget.
+           The user has [un]checked the 'Present Tooltips'
+           checkbox. Set the 'presentToolTips'
+           preference to the new value if the user can present tooltips.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        self.prefsDict["presentToolTips"] = widget.get_active() and \
+                                            settings.canPresentToolTips
+
     def disableKeyGrabChecked(self, widget):
         """Signal handler for the "toggled" signal for the
            disableKeyGrabCheckButton GtkCheckButton widget.
