
--- control-center-1.4.0.1/capplets/screensaver-properties/callbacks.c.foo	Mon Apr 23 01:26:21 2001
+++ control-center-1.4.0.1/capplets/screensaver-properties/callbacks.c	Mon Apr 23 01:31:00 2001
@@ -734,6 +734,17 @@
                 g_string_append (command, temp);
                 if (password)
                         g_string_append (command, " -lock-mode");
+		if (dpms) {
+			/* does anyone know what standby is? */
+			/* does it matter? laptops? */
+			snprintf (temp, 10, "00:%2d:00",(gint) (dpmsmins + waitmins));
+			g_string_append (command, " -dpms -dpms-standby");
+			g_string_append (command, temp);
+			g_string_append (command, " -dpms-suspend");
+			g_string_append (command, temp);
+			g_string_append (command, " -dpms-poweroff");
+		} else
+		  g_string_append (command, " -no-dpms");
                 if (sd->name != random_screensaver) {
                         g_string_append (command," -xrm \"*programs:\t");
 #ifdef HAVE_REDHAT_XSCREENSAVER_RPM
@@ -755,23 +766,6 @@
                 system (command->str);
                 g_string_free (command, TRUE);
         }
-        if (dpms) {
-                /* does anyone know what standby is? */
-                /* does it matter? laptops? */
-                snprintf (temp, 10, "%d",(gint) (dpmsmins + waitmins) * 60);
-                command = g_string_new ("xset dpms ");
-                g_string_append (command, temp); /* suspend */
-                g_string_append_c (command, ' ');
-                g_string_append (command, temp); /* standby */
-                g_string_append_c (command, ' ');
-                g_string_append (command, temp); /* off */
-
-                system (command->str);
-                g_string_free (command, TRUE);
-        }
-        else
-                system ("xset -dpms");
-
         gnome_config_sync ();
 }
 void
