Mercurial Mercurial > upstream > oracle > 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/gnome-power-manager-10-no-dpms-sync.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 17124 527f4ec62c72
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17124
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     1
 
diff -uprN gnome-power-manager-2.24.4-orig/src/gpm-dpms.c gnome-power-manager-2.24.4/src/gpm-dpms.c
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     2
 
--- gnome-power-manager-2.24.4-orig/src/gpm-dpms.c	2009-03-19 14:37:38.856619450 +0800
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     3
 
+++ gnome-power-manager-2.24.4/src/gpm-dpms.c	2009-03-19 14:39:35.232623388 +0800
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     4
 
@@ -343,6 +343,7 @@ static gboolean
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     5
 
 sync_settings (GpmDpms *dpms,
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     6
 
 	       GError **error)
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     7
 
 {
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     8
 
+#if 0
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     9
 
 	guint    standby;
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    10
 
 	guint    suspend;
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    11
 
 	guint    off;
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    12
 
@@ -378,6 +379,8 @@ sync_settings (GpmDpms *dpms,
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    13
 
 					      suspend,
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    14
 
 					      off,
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    15
 
 					      error);
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    16
 
+#endif
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    17
 
+	return TRUE;
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    18
 
 }
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    19
527f4ec62c72 2009-12-04 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    20
 
 gboolean
upstream/oracle/spec-files