X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fxset.c;h=2e167c1468dd6e463aa6c1ebb22d5fe0ade146c6;hp=eea175c8472d0ac82221fcf930fccf6fe3dec03d;hb=3210e7e80ee2b5a7d2049a5aaff9f17b9c93dcc9;hpb=cf665b135b41d4f42067f9d9a8111c9602777cc1

diff --git a/driver/xset.c b/driver/xset.c
index eea175c8..2e167c14 100644
--- a/driver/xset.c
+++ b/driver/xset.c
@@ -129,7 +129,7 @@ init_sgi_saver_extension (saver_info *si)
        "%s: SGI SCREEN_SAVER extension exists, but can't be initialized;\n\
 		perhaps some other screensaver program is already running?\n",
 		   blurb());
-	  p->use_sgi_saver_extension = False;
+	  si->using_sgi_saver_extension = False;
 	  return;
 	}
     }
@@ -196,13 +196,13 @@ disable_builtin_screensaver (saver_info *si, Bool unblank_screen_p)
      on some systems that don't support XDPMS?  Who know... */
   desired_allow_exp = AllowExposures;
 
-  if (p->use_mit_saver_extension || p->use_sgi_saver_extension)
+  if (si->using_mit_saver_extension || si->using_sgi_saver_extension)
     {
       desired_server_timeout = (p->timeout / 1000);
 
       /* The SGI extension won't give us events unless blanking is on.
 	 I think (unsure right now) that the MIT extension is the opposite. */
-      if (p->use_sgi_saver_extension)
+      if (si->using_sgi_saver_extension)
 	desired_prefer_blank = PreferBlanking;
       else
 	desired_prefer_blank = DontPreferBlanking;
@@ -249,10 +249,10 @@ disable_builtin_screensaver (saver_info *si, Bool unblank_screen_p)
       {
 	extension_initted = True;
 # ifdef HAVE_MIT_SAVER_EXTENSION
-	if (p->use_mit_saver_extension) init_mit_saver_extension(si);
+	if (si->using_mit_saver_extension) init_mit_saver_extension(si);
 # endif
 # ifdef HAVE_SGI_SAVER_EXTENSION
-	if (p->use_sgi_saver_extension) init_sgi_saver_extension(si);
+	if (si->using_sgi_saver_extension) init_sgi_saver_extension(si);
 # endif
       }
   }