upstream/oracle/userland-gate: components/desktop/xscreensaver/patches/0007-passwdTimeout-pref.patch@0416d82f7f55 (annotated)

5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	1	From 37f1a55c40ce9aaf136f1512068b04f6a5c36d48 Mon Sep 17 00:00:00 2001
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	2	From: Alan Coopersmith <[email protected]>
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	3	Date: Sat, 2 Jan 2016 22:02:23 -0800
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	4	Subject: [PATCH] passwdTimeout pref
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	5
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	6	Bug 15220000 SUNBT5077981 There should be an option to extend/disable lockout
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	7	timer
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	8	aka http://bugzilla.gnome.org/show_bug.cgi?id=147579
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	9
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	10	Bug 15231258 SUNBT6176524 passwdTimeoutEnable for disabled user
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	11
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	12	Upstream status unknown.
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	13	---
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	14	driver/XScreenSaver.ad.in \| 1 +
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	15	driver/demo-Gtk.c \| 13 +++++
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	16	driver/lock.c \| 8 ++++
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	17	driver/prefs.c \| 6 +++
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	18	driver/types.h \| 2 +
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	19	driver/xscreensaver-demo.glade2.in \| 98 +++++++++++++++++++++++++++++++++++++-
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	20	6 files changed, 127 insertions(+), 1 deletion(-)
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	21
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	22	diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	23	index 3e1ff8a..0a0ccf8 100644
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	24	--- a/driver/XScreenSaver.ad.in
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	25	+++ b/driver/XScreenSaver.ad.in
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	26	@@ -33,6 +33,7 @@
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	27	*cycle: 0:10:00
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	28	*lockTimeout: 0:00:00
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	29	*passwdTimeout: 0:02:00
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	30	+*passwdTimeoutEnabled: True
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	31	*dpmsEnabled: True
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	32	*dpmsQuickoffEnabled: False
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	33	*dpmsStandby: 0:10:00
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	34	diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	35	index d4cc4a5..3d86087 100644
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	36	--- a/driver/demo-Gtk.c
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	37	+++ b/driver/demo-Gtk.c
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	38	@@ -1566,6 +1566,8 @@ flush_dialog_changes_and_save (state *s)
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	39
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	40	MINUTES (&p2->timeout, "timeout_spinbutton");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	41	MINUTES (&p2->cycle, "cycle_spinbutton");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	42	+ CHECKBOX (p2->unlock_timeout_p, "pwd_button"); /* bugid 5077981 */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	43	+ MINUTES (&p2->passwd_timeout, "pwd_spinbutton");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	44	CHECKBOX (p2->lock_p, "lock_button");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	45	MINUTES (&p2->lock_timeout, "lock_spinbutton");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	46
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	47	@@ -1670,6 +1672,8 @@ flush_dialog_changes_and_save (state *s)
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	48	COPY(cycle, "cycle");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	49	COPY(lock_p, "lock_p");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	50	COPY(lock_timeout, "lock_timeout");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	51	+ COPY(unlock_timeout_p,"unlock_timeout_p"); /* bugid 5077981 */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	52	+ COPY(passwd_timeout, "passwd_timeout");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	53
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	54	COPY(dpms_enabled_p, "dpms_enabled_p");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	55	COPY(dpms_quickoff_p, "dpms_quickoff_enabled_p");
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	56	@@ -2802,6 +2806,9 @@ populate_prefs_page (state *s)
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	57	FMT_MINUTES ("timeout_spinbutton", p->timeout);
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	58	FMT_MINUTES ("cycle_spinbutton", p->cycle);
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	59	FMT_MINUTES ("lock_spinbutton", p->lock_timeout);
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	60	+ /* bugid 5077981 */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	61	+ FMT_MINUTES ("pwd_spinbutton", p->passwd_timeout);
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	62	+
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	63	FMT_MINUTES ("dpms_standby_spinbutton", p->dpms_standby);
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	64	FMT_MINUTES ("dpms_suspend_spinbutton", p->dpms_suspend);
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	65	FMT_MINUTES ("dpms_off_spinbutton", p->dpms_off);
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	66	@@ -2814,6 +2821,7 @@ populate_prefs_page (state *s)
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	67	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (name_to_widget (s,(NAME))),\
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	68	(ACTIVEP))
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	69
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	70	+ TOGGLE_ACTIVE ("pwd_button", p->unlock_timeout_p); /* bugid 5077981 */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	71	TOGGLE_ACTIVE ("lock_button", p->lock_p);
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	72	#if 0
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	73	TOGGLE_ACTIVE ("verbose_button", p->verbose_p);
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	74	@@ -2919,6 +2927,10 @@ populate_prefs_page (state *s)
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	75
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	76	/* Blanking and Locking
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	77	*/
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	78	+ /* bugid 5077081 */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	79	+ SENSITIZE ("pwd_spinbutton", p->unlock_timeout_p);
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	80	+ SENSITIZE ("pwd_mlabel", p->unlock_timeout_p);
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	81	+
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	82	SENSITIZE ("lock_button", can_lock_p);
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	83	SENSITIZE ("lock_spinbutton", can_lock_p && p->lock_p);
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	84	SENSITIZE ("lock_mlabel", can_lock_p && p->lock_p);
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	85	@@ -3093,6 +3105,7 @@ fix_text_entry_sizes (state *s)
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	86	# if 0 /* appears no longer necessary with Gtk 1.2.10 */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	87	const char * const spinbuttons[] = {
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	88	"timeout_spinbutton", "cycle_spinbutton", "lock_spinbutton",
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	89	+ "pwd_spinbutton", /* bugid 5077981 */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	90	"dpms_standby_spinbutton", "dpms_suspend_spinbutton",
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	91	"dpms_off_spinbutton",
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	92	"-fade_spinbutton" };
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	93	diff --git a/driver/lock.c b/driver/lock.c
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	94	index becf85b..08f0f98 100644
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	95	--- a/driver/lock.c
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	96	+++ b/driver/lock.c
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	97	@@ -1651,6 +1651,10 @@ update_passwd_window (saver_info si, const char printed_passwd, float ratio)
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	98	event.xclient.data.l[1] = 0;
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	99	event.xclient.data.l[2] = 0;
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	100
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	101	+ /* CR 5077981: option to disable unlock timer */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	102	+ if (! si->prefs.unlock_timeout_p)
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	103	+ event.xclient.data.l[1] = 1;
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	104	+
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	105	if (!safe_XSendEvent (si->dpy, si->passwd_dialog, False, 0L, &event))
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	106	fprintf (stderr, "%s: error sending ratio to lock dialog\n", blurb ());
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	107	}
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	108	@@ -2358,6 +2362,10 @@ passwd_animate_timer (XtPointer closure, XtIntervalId *id)
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	109
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	110	if (!pw) return;
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	111
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	112	+ /* CR 5077981: option to disable unlock timer */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	113	+ if (! si->prefs.unlock_timeout_p)
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	114	+ return;
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	115	+
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	116	#ifdef HAVE_XSCREENSAVER_LOCK
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	117	/* We want to make sure dialog is up before we update countdown timer */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	118	if (!si->passwd_dialog)
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	119	diff --git a/driver/prefs.c b/driver/prefs.c
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	120	index 55bac7b..52538a8 100644
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	121	--- a/driver/prefs.c
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	122	+++ b/driver/prefs.c
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	123	@@ -252,6 +252,7 @@ static const char * const prefs[] = {
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	124	"lockVTs", /* not saved */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	125	"lockTimeout",
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	126	"passwdTimeout",
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	127	+ "passwdTimeoutEnabled", /* bugid 5077981 */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	128	"visualID",
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	129	"installColormap",
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	130	"verbose",
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	131	@@ -786,6 +787,9 @@ write_init_file (Display *dpy,
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	132	CHECK("lockVTs") continue; /* don't save, unused */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	133	CHECK("lockTimeout") type = pref_time, t = p->lock_timeout;
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	134	CHECK("passwdTimeout") type = pref_time, t = p->passwd_timeout;
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	135	+
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	136	+/* bugid 5077981 */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	137	+ CHECK("passwdTimeoutEnabled") type = pref_bool, b = p->unlock_timeout_p;
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	138	CHECK("visualID") type = pref_str, s = visual_name;
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	139	CHECK("installColormap") type = pref_bool, b = p->install_cmap_p;
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	140	CHECK("verbose") type = pref_bool, b = p->verbose_p;
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	141	@@ -1071,6 +1075,8 @@ load_init_file (Display dpy, saver_preferences p)
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	142	p->lock_timeout = 1000 * get_minutes_resource (dpy, "lockTimeout", "Time");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	143	p->cycle = 1000 * get_minutes_resource (dpy, "cycle", "Time");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	144	p->passwd_timeout = 1000 * get_seconds_resource (dpy, "passwdTimeout", "Time");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	145	+ /* bugid 5077981 */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	146	+ p->unlock_timeout_p = get_boolean_resource (dpy, "passwdTimeoutEnabled", "Boolean");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	147	p->pointer_timeout = 1000 * get_seconds_resource (dpy, "pointerPollTime", "Time");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	148	p->pointer_hysteresis = get_integer_resource (dpy, "pointerHysteresis","Integer");
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	149	p->notice_events_timeout = 1000*get_seconds_resource(dpy,
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	150	diff --git a/driver/types.h b/driver/types.h
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	151	index c77ee3f..b428f73 100644
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	152	--- a/driver/types.h
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	153	+++ b/driver/types.h
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	154	@@ -97,6 +97,8 @@ struct saver_preferences {
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	155	Bool xsync_p; /* whether XSynchronize has been called */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	156
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	157	Bool lock_p; /* whether to lock as well as save */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	158	+ Bool unlock_timeout_p; /* whether to timeout unlock dialog */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	159	+ /* bugid 5077981 */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	160
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	161	Bool fade_p; /* whether to fade to black, if possible */
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	162	Bool unfade_p; /* whether to fade from black, if possible */
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	163	diff --git a/driver/xscreensaver-demo.glade2.in b/driver/xscreensaver-demo.glade2.in
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	164	index 40e47f6..a7a06a6 100644
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	165	--- a/driver/xscreensaver-demo.glade2.in
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	166	+++ b/driver/xscreensaver-demo.glade2.in
5400 1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	167	@@ -165,7 +165,7 @@
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	168	<child>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	169	<widget class="GtkTable" id="blanking_table">
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	170	<property name="visible">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	171	- <property name="n_rows">3</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	172	+ <property name="n_rows">4</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	173	<property name="n_columns">4</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	174	<property name="homogeneous">False</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	175	<property name="row_spacing">2</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	176	@@ -466,6 +466,102 @@
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	177	<property name="y_options"></property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	178	</packing>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	179	</child>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	180	+
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	181	+ <child>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	182	+ <widget class="GtkSpinButton" id="pwd_spinbutton">
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	183	+ <property name="visible">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	184	+ <property name="tooltip" translatable="yes">How long the unlock dialog waits for input before disappearing.</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	185	+ <property name="can_focus">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	186	+ <property name="climb_rate">15</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	187	+ <property name="digits">0</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	188	+ <property name="numeric">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	189	+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	190	+ <property name="snap_to_ticks">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	191	+ <property name="wrap">False</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	192	+ <property name="adjustment">0 0 720 1 15 15</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	193	+ <accessibility>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	194	+ <atkrelation target="pwd_button" type="controlled-by"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	195	+ <atkrelation target="pwd_button" type="labelled-by"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	196	+ <atkrelation target="pwd_mlabel" type="labelled-by"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	197	+ </accessibility>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	198	+ <signal name="activate" handler="pref_changed_cb"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	199	+ <signal name="focus_out_event" handler="pref_changed_event_cb"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	200	+ <signal name="value_changed" handler="pref_changed_cb"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	201	+ </widget>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	202	+ <packing>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	203	+ <property name="left_attach">2</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	204	+ <property name="right_attach">3</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	205	+ <property name="top_attach">3</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	206	+ <property name="bottom_attach">4</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	207	+ <property name="y_padding">10</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	208	+ <property name="x_options">fill</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	209	+ <property name="y_options"></property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	210	+ </packing>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	211	+ </child>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	212	+
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	213	+ <child>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	214	+ <widget class="GtkEventBox" id="pwd_button_eventbox">
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	215	+ <property name="visible">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	216	+ <property name="tooltip" translatable="yes">Whether the unlock dialog box should disappear after a timeout.</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	217	+ <property name="visible_window">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	218	+ <property name="above_child">False</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	219	+
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	220	+ <child>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	221	+ <widget class="GtkCheckButton" id="pwd_button">
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	222	+ <property name="visible">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	223	+ <property name="can_focus">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	224	+ <property name="label" translatable="yes">Timeout _Unlock After</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	225	+ <property name="use_underline">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	226	+ <property name="relief">GTK_RELIEF_NORMAL</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	227	+ <property name="focus_on_click">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	228	+ <property name="active">False</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	229	+ <property name="inconsistent">False</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	230	+ <property name="draw_indicator">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	231	+ <accessibility>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	232	+ <atkrelation target="pwd_spinbutton" type="controller-for"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	233	+ <atkrelation target="pwd_spinbutton" type="label-for"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	234	+ <atkrelation target="pwd_spinbutton" type="flows-to"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	235	+ </accessibility>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	236	+ <signal name="toggled" handler="pref_changed_cb"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	237	+ </widget>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	238	+ </child>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	239	+ </widget>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	240	+ <packing>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	241	+ <property name="left_attach">0</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	242	+ <property name="right_attach">2</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	243	+ <property name="top_attach">3</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	244	+ <property name="bottom_attach">4</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	245	+ <property name="x_options">fill</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	246	+ <property name="y_options">fill</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	247	+ </packing>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	248	+ </child>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	249	+
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	250	+ <child>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	251	+ <widget class="GtkLabel" id="pwd_mlabel">
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	252	+ <property name="visible">True</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	253	+ <property name="label" translatable="yes">minutes</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	254	+ <property name="use_underline">False</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	255	+ <property name="use_markup">False</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	256	+ <property name="justify">GTK_JUSTIFY_LEFT</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	257	+ <property name="wrap">False</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	258	+ <property name="selectable">False</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	259	+ <property name="xalign">0</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	260	+ <property name="yalign">0.5</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	261	+ <property name="xpad">8</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	262	+ <property name="ypad">0</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	263	+ <accessibility>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	264	+ <atkrelation target="pwd_spinbutton" type="label-for"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	265	+ <atkrelation target="pwd_spinbutton" type="flows-from"/>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	266	+ </accessibility>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	267	+ </widget>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	268	+ <packing>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	269	+ <property name="left_attach">3</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	270	+ <property name="right_attach">4</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	271	+ <property name="top_attach">3</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	272	+ <property name="bottom_attach">4</property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	273	+ <property name="y_options"></property>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	274	+ </packing>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	275	+ </child>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	276	</widget>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	277	<packing>
1199f8e91f50 22592978 Move xscreensaver to the Userland gate Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: diff changeset	278	<property name="left_attach">0</property>
5561 0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	279	--
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	280	2.6.1
0416d82f7f55 22593000 Upgrade xscreensaver to version 5.34 Alan Coopersmith <Alan.Coopersmith@Oracle.COM> parents: 5400 diff changeset	281

author	Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
	Tue, 08 Mar 2016 09:00:31 -0800
changeset 5561	0416d82f7f55
parent 5400	components/desktop/xscreensaver/patches/08-passwdTimeout-pref.patch@1199f8e91f50
child 7818	c93a988b3522
permissions	-rw-r--r--