http://www.archive.org/download/tucows_10294_XScreenSaver/xscreensaver-4.10.tar.gz

[xscreensaver] / driver / lock.c

diff --git a/driver/lock.c b/driver/lock.c
index 47c1b4ee515b3ed3082dc6a9aa814b59bbb5aa81..529bf862326f597d90b395fc76be3a7bdcc11bca 100644 (file)
--- a/driver/lock.c
+++ b/driver/lock.c
@@ -407,7 +407,11 @@ make_passwd_window (saver_info *si)
                   attrmask, &attrs);
   XSetWindowBackground (si->dpy, si->passwd_dialog, pw->background);
 
-  pw->logo_pixmap = xscreensaver_logo (ssi->screen, ssi->current_visual,
+  /* We use the default visual, not ssi->visual, so that the logo pixmap's
+     visual matches that of the si->passwd_dialog window. */
+  pw->logo_pixmap = xscreensaver_logo (ssi->screen,
+                                       /* ssi->current_visual, */
+                                       DefaultVisualOfScreen(screen),
                                        si->passwd_dialog, cmap,
                                        pw->background, 
                                        &pw->logo_pixels, &pw->logo_npixels,