Index: src/orca/scripts/apps/gnome-screensaver-dialog.py
===================================================================
--- src/orca/scripts/apps/gnome-screensaver-dialog.py	(revision 0)
+++ src/orca/scripts/apps/gnome-screensaver-dialog.py	(revision 0)
@@ -0,0 +1,55 @@
+# Orca
+#
+# Copyright 2008 Sun Microsystems Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., Franklin Street, Fifth Floor,
+# Boston MA  02110-1301 USA.
+
+"""Custom script for gnome-screensaver-dialog."""
+
+__id__        = "$Id:$"
+__version__   = "$Revision:$"
+__date__      = "$Date:$"
+__copyright__ = "Copyright (c) 2008 Sun Microsystems Inc."
+__license__   = "LGPL"
+
+import pyatspi
+
+import orca.default as default
+import orca.speech as speech
+
+class Script(default.Script):
+
+    def onStateChanged(self, event):
+        """Called whenever an object's state changes.
+
+        Arguments:
+        - event: the Event
+        """
+
+        # If we are focused in a password text area, we need to check if
+        # there are any useful messages displayed in a couple of labels that
+        # are visually below that password area. If there are, then speak
+        # them for the user. See bug #529655 for more details.
+        #
+        if event.type.startswith("object:state-changed:focused") and \
+           event.source.getRole() == pyatspi.ROLE_PASSWORD_TEXT:
+            obj = event.source.parent.parent.parent
+            for child in obj:
+                if child.getRole() == pyatspi.ROLE_LABEL:
+                    if child.name:
+                        speech.speak(child.name)
+        else:
+            default.Script.onStateChanged(self, event)
Index: src/orca/scripts/apps/Makefile.am
===================================================================
--- src/orca/scripts/apps/Makefile.am	(revision 3934)
+++ src/orca/scripts/apps/Makefile.am	(working copy)
@@ -18,6 +18,7 @@
 	gnome-keyring-ask.py \
 	gnome-mud.py \
 	gnome-panel.py \
+	gnome-screensaver-dialog.py \
 	gnome-search-tool.py \
 	gnome_segv2.py \
 	gnome-system-monitor.py \
