/*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=5077981
http://bugzilla.gnome.org/show_bug.cgi?id=147579
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6176524
---
@@ -34,6 +34,7 @@
+ /* bugid 5077981 */
+
(ACTIVEP))
#if 0
/* Blanking and Locking
*/
+ /* bugid 5077081 */
+
# if 0 /* appears no longer necessary with Gtk 1.2.10 */
const char * const spinbuttons[] = {
"timeout_spinbutton", "cycle_spinbutton", "lock_spinbutton",
+ "pwd_spinbutton", /* bugid 5077981 */
"dpms_standby_spinbutton", "dpms_suspend_spinbutton",
"dpms_off_spinbutton",
"-fade_spinbutton" };
@@ -1622,6 +1622,10 @@ update_passwd_window (saver_info *si, const char *printed_passwd, float ratio)
+ /* CR 5077981: option to disable unlock timer */
+
}
if (!pw) return;
+ /* CR 5077981: option to disable unlock timer */
+ return;
+
/* We want to make sure dialog is up before we update countdown timer */
if (!si->passwd_dialog)
"lockVTs", /* not saved */
"lockTimeout",
"passwdTimeout",
+ "passwdTimeoutEnabled", /* bugid 5077981 */
"visualID",
"installColormap",
"verbose",
+
+/* bugid 5077981 */
+ /* bugid 5077981 */
+ /* bugid 5077981 */
diff --git xscreensaver-5.12/driver/xscreensaver-demo.glade2 xscreensaver-5.12/driver/xscreensaver-demo.glade2
@@ -165,7 +165,7 @@
<child>
@@ -466,6 +466,102 @@
</packing>
</child>
+
+ <child>
+ <property name="tooltip" translatable="yes">How long the unlock dialog waits for input before disappearing.</property>
+ <accessibility>
+ </accessibility>
+ </widget>
+ <packing>
+ </packing>
+ </child>
+
+ <child>
+ <property name="tooltip" translatable="yes">Whether the unlock dialog box should disappear after a timeout.</property>
+
+ <child>
+ <accessibility>
+ </accessibility>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ </packing>
+ </child>
+
+ <child>
+ <accessibility>
+ </accessibility>
+ </widget>
+ <packing>
+ </packing>
+ </child>
</widget>
<packing>