gnome-power-manager r2392 - in trunk: . data src

[rhughes svn gnome org]

Author: rhughes
Date: 2007-07-26 13:30:13 +0100 (Thu, 26 Jul 2007)
New Revision: 2392
ViewCVS link: http://svn.gnome.org/viewcvs/gnome-power-manager?rev=2392&view=rev

Modified:
   trunk/ChangeLog
   trunk/data/gnome-power-manager.schemas.in
   trunk/src/gpm-conf.h
   trunk/src/gpm-control.c
Log:
2007-07-26  Richard Hughes  <richard hughsie com>

* data/gnome-power-manager.schemas.in:
* src/gpm-conf.h:
* src/gpm-control.c: (gpm_control_suspend),
(gpm_control_hibernate):
Split up the lock/gnome_keyring options into lock/gnome_keyring_suspend
and lock/gnome_keyring_hibernate to fix #459747.
We default to off for suspend and on for hibernate.