Mercurial Mercurial > sustaining > oi_151a > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/control-center-11-disable-gnome-screensaver.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 8378 a54120731ea6
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8378
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
     1
 
diff -urNp control-center-2.12.1/gnome-settings-daemon/gnome-settings-screensaver.c control-center-2.12.1-hacked/gnome-settings-daemon/gnome-settings-screensaver.c
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
     2
 
--- control-center-2.12.1/gnome-settings-daemon/gnome-settings-screensaver.c	2005-07-25 23:55:59.000000000 +1200
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
     3
 
+++ control-center-2.12.1-hacked/gnome-settings-daemon/gnome-settings-screensaver.c	2005-11-09 13:09:14.488848000 +1300
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
     4
 
@@ -74,24 +74,16 @@
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
     5
 
 really_start_screensaver (gpointer user_data)
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
     6
 
 {
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
     7
 
 	GError *gerr = NULL;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
     8
 
-	gboolean use_gscreensaver = FALSE;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
     9
 
 	gboolean show_error;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    10
 
 	GtkWidget *dialog, *toggle;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    11
 
 	gchar *ss_command;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    12
 
 	GConfClient *client;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    13
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    14
 
-	if ((ss_command = g_find_program_in_path ("gnome-screensaver")))
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    15
 
-		use_gscreensaver = TRUE;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    16
 
-	else {
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    17
 
-		if (!(ss_command = g_find_program_in_path ("xscreensaver")))
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    18
 
-			return FALSE;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    19
 
-	}
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    20
 
+	if (!(ss_command = g_find_program_in_path ("xscreensaver")))
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    21
 
+		return FALSE;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    22
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    23
 
 	g_free (ss_command);
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    24
 
-	if (use_gscreensaver)
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    25
 
-		ss_command = GSCREENSAVER_COMMAND;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    26
 
-	else
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    27
 
-		ss_command = XSCREENSAVER_COMMAND;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    28
 
+	ss_command = XSCREENSAVER_COMMAND;
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    29
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    30
 
 	if (g_spawn_command_line_async (ss_command, &gerr))
a54120731ea6 2006-10-20 Darren Kenny <[email protected]>
dkenny
parents:
diff changeset 
    31
 
 		return FALSE;
sustaining/oi_151a/spec-files