1 From 8c50007e132d474a772ac456786342c0fe7fe189 Mon Sep 17 00:00:00 2001 |
1 From a5e9aa2e68624b0162e69829bfc5a633e5cf8b79 Mon Sep 17 00:00:00 2001 |
2 From: Alan Coopersmith <[email protected]> |
2 From: Alan Coopersmith <[email protected]> |
3 Date: Sat, 2 Jan 2016 20:36:57 -0800 |
3 Date: Sat, 2 Jan 2016 20:36:57 -0800 |
4 Subject: [PATCH] gtk-lock |
4 Subject: [PATCH] gtk-lock |
5 |
5 |
6 Solaris uses the gtk unlock dialog program originally written by |
6 Solaris uses the gtk unlock dialog program originally written by |
107 + |
107 + |
108 /* Define this if you have the X Shared Memory Extension. */ |
108 /* Define this if you have the X Shared Memory Extension. */ |
109 #undef HAVE_XSHM_EXTENSION |
109 #undef HAVE_XSHM_EXTENSION |
110 |
110 |
111 diff --git a/configure.in b/configure.in |
111 diff --git a/configure.in b/configure.in |
112 index 4c4dee5..eb753a3 100644 |
112 index 5ff8aea..dea1f6a 100644 |
113 --- a/configure.in |
113 --- a/configure.in |
114 +++ b/configure.in |
114 +++ b/configure.in |
115 @@ -2666,6 +2666,7 @@ if test "$with_gtk" = yes; then |
115 @@ -2665,6 +2665,7 @@ if test "$with_gtk" = yes; then |
116 pkg_check_version libglade-2.0 1.99.0 |
116 pkg_check_version libxml-2.0 2.4.6 |
117 pkg_check_version gdk-pixbuf-2.0 2.0.0 |
117 pkg_check_version gdk-pixbuf-2.0 2.0.0 |
118 pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0 |
118 pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0 |
119 + pkg_check_version gconf-2.0 2.6.1 |
119 + pkg_check_version gconf-2.0 2.6.1 |
120 have_gtk="$ok" |
120 have_gtk="$ok" |
121 |
121 |
122 if test "$have_gtk" = no; then |
122 if test "$have_gtk" = no; then |
123 @@ -2681,6 +2682,9 @@ if test "$with_gtk" = yes; then |
123 @@ -2680,6 +2681,9 @@ if test "$with_gtk" = yes; then |
124 fi |
124 fi |
125 |
125 |
126 if test "$have_gtk" = yes; then |
126 if test "$have_gtk" = yes; then |
127 +#--- Begin SUNW addition |
127 +#--- Begin SUNW addition |
128 + AC_DEFINE(HAVE_XSCREENSAVER_LOCK,[],[Define this to build the external lock dialog]) |
128 + AC_DEFINE(HAVE_XSCREENSAVER_LOCK,[],[Define this to build the external lock dialog]) |
129 +#--- End SUNW addition |
129 +#--- End SUNW addition |
130 AC_CACHE_CHECK([for Gtk includes], ac_cv_gtk_config_cflags, |
130 AC_CACHE_CHECK([for Gtk includes], ac_cv_gtk_config_cflags, |
131 [ac_cv_gtk_config_cflags=`$pkg_config --cflags $pkgs`]) |
131 [ac_cv_gtk_config_cflags=`$pkg_config --cflags $pkgs`]) |
132 AC_CACHE_CHECK([for Gtk libs], ac_cv_gtk_config_libs, |
132 AC_CACHE_CHECK([for Gtk libs], ac_cv_gtk_config_libs, |
133 @@ -3933,6 +3937,16 @@ if test "$have_gtk" = yes; then |
133 @@ -3932,6 +3936,16 @@ if test "$have_gtk" = yes; then |
134 ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS" |
134 ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS" |
135 fi |
135 fi |
136 |
136 |
137 +#--- Begin SUNW addition |
137 +#--- Begin SUNW addition |
138 +PREFERRED_LOCK_PROGRAM= |
138 +PREFERRED_LOCK_PROGRAM= |
145 +fi |
145 +fi |
146 +#--- End SUNW addition |
146 +#--- End SUNW addition |
147 |
147 |
148 if test "$have_kerberos" = yes; then |
148 if test "$have_kerberos" = yes; then |
149 PASSWD_SRCS="$PASSWD_SRCS \$(KERBEROS_SRCS)" |
149 PASSWD_SRCS="$PASSWD_SRCS \$(KERBEROS_SRCS)" |
150 @@ -4077,6 +4091,11 @@ AC_SUBST(INCLUDES) |
150 @@ -4076,6 +4090,11 @@ AC_SUBST(INCLUDES) |
151 |
151 |
152 AC_SUBST(PREFERRED_DEMO_PROGRAM) |
152 AC_SUBST(PREFERRED_DEMO_PROGRAM) |
153 AC_SUBST(ALL_DEMO_PROGRAMS) |
153 AC_SUBST(ALL_DEMO_PROGRAMS) |
154 +#--- Begin SUNW addition |
154 +#--- Begin SUNW addition |
155 +AC_SUBST(PREFERRED_LOCK_PROGRAM) |
155 +AC_SUBST(PREFERRED_LOCK_PROGRAM) |
157 +AC_SUBST(LOCK_PROGRAM) |
157 +AC_SUBST(LOCK_PROGRAM) |
158 +#--- End SUNW addition |
158 +#--- End SUNW addition |
159 AC_SUBST(SAVER_LIBS) |
159 AC_SUBST(SAVER_LIBS) |
160 AC_SUBST(MOTIF_LIBS) |
160 AC_SUBST(MOTIF_LIBS) |
161 AC_SUBST(GTK_LIBS) |
161 AC_SUBST(GTK_LIBS) |
162 @@ -4598,7 +4617,8 @@ HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@/$@@;s@//*@/@g'` |
162 @@ -4597,7 +4616,8 @@ HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@/$@@;s@//*@/@g'` |
163 |
163 |
164 |
164 |
165 # Sanity check the hackdir |
165 # Sanity check the hackdir |
166 -for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command ; do |
166 -for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command ; do |
167 +# SUNW addition: added xscreensaver-lock to list on next line |
167 +# SUNW addition: added xscreensaver-lock to list on next line |
168 +for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command xscreensaver-lock ; do |
168 +for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command xscreensaver-lock ; do |
169 if test "${HACKDIR}" = "${bindir}/${bad_choice}" ; then |
169 if test "${HACKDIR}" = "${bindir}/${bad_choice}" ; then |
170 echo "" |
170 echo "" |
171 AC_MSG_ERROR([\"--with-hackdir=${bindir}/${bad_choice}\" won't work. |
171 AC_MSG_ERROR([\"--with-hackdir=${bindir}/${bad_choice}\" won't work. |
172 diff --git a/driver/Makefile.in b/driver/Makefile.in |
172 diff --git a/driver/Makefile.in b/driver/Makefile.in |
173 index 90ef1d2..a44e312 100644 |
173 index 5f269df..22c486f 100644 |
174 --- a/driver/Makefile.in |
174 --- a/driver/Makefile.in |
175 +++ b/driver/Makefile.in |
175 +++ b/driver/Makefile.in |
176 @@ -29,6 +29,7 @@ GTK_APPDIR = $(GTK_DATADIR)/applications |
176 @@ -29,6 +29,7 @@ GTK_APPDIR = $(GTK_DATADIR)/applications |
177 GTK_ICONDIR = $(GTK_DATADIR)/pixmaps |
177 GTK_ICONDIR = $(GTK_DATADIR)/pixmaps |
178 GTK_GLADEDIR = $(prefix)/lib/xscreensaver/config |
178 GTK_GLADEDIR = $(prefix)/lib/xscreensaver/config |
365 +extern int write_to_child (saver_info* si, const char* cmd, const char *msg); |
365 +extern int write_to_child (saver_info* si, const char* cmd, const char *msg); |
366 +#endif |
366 +#endif |
367 + |
367 + |
368 #endif |
368 #endif |
369 diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c |
369 diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c |
370 index 3fa27c3..ece3c44 100644 |
370 index 6457d15..d62152c 100644 |
371 --- a/driver/demo-Gtk.c |
371 --- a/driver/demo-Gtk.c |
372 +++ b/driver/demo-Gtk.c |
372 +++ b/driver/demo-Gtk.c |
373 @@ -98,6 +98,8 @@ |
373 @@ -97,6 +97,8 @@ |
374 # define G_MODULE_EXPORT /**/ |
374 # define G_MODULE_EXPORT /**/ |
375 #endif /* !HAVE_GTK2 */ |
375 #endif /* !HAVE_GTK2 */ |
376 |
376 |
377 +#include <gconf/gconf-client.h> |
377 +#include <gconf/gconf-client.h> |
378 + |
378 + |
379 #if defined(DEFAULT_ICONDIR) && !defined(GLADE_DIR) |
379 #if defined(DEFAULT_ICONDIR) && !defined(GLADE_DIR) |
380 # define GLADE_DIR DEFAULT_ICONDIR |
380 # define GLADE_DIR DEFAULT_ICONDIR |
381 #endif |
381 #endif |
382 @@ -5042,6 +5044,22 @@ main (int argc, char **argv) |
382 @@ -5038,6 +5040,22 @@ main (int argc, char **argv) |
383 load_init_file (dpy, p); |
383 load_init_file (dpy, p); |
384 initialize_sort_map (s); |
384 initialize_sort_map (s); |
385 |
385 |
386 + /* Bug 147639: Gok cant automatically UI grab screensaver preferences */ |
386 + /* Bug 147639: Gok cant automatically UI grab screensaver preferences */ |
387 + { |
387 + { |