[gnome-power-manager: 3/3] Merge branch 'cc-power'

[Richard Hughes <rhughes src gnome org>]

commit bdd0ec516054db64909bc28376acd6df229133df
Merge: f47d16e 6273ede
Author: Richard Hughes <richard hughsie com>
Date:   Fri Jun 25 13:02:12 2010 +0100

    Merge branch 'cc-power'

 configure.ac                               |    6 +
 data/gnome-power-preferences.desktop.in.in |    3 +-
 data/gpm-prefs.ui                          |   19 -
 data/org.gnome.power-manager.gschema.xml   |   72 +++--
 man/Makefile.am                            |    9 +-
 man/gnome-power-preferences.sgml           |  136 --------
 po/POTFILES.in                             |    3 +-
 src/.gitignore                             |    3 +-
 src/Makefile.am                            |   33 ++-
 src/{gpm-prefs-core.c => cc-power-panel.c} |  507 +++++++++++----------------
 src/cc-power-panel.h                       |   54 +++
 src/gpm-backlight.c                        |   12 +-
 src/gpm-common.c                           |   81 -----
 src/gpm-common.h                           |    4 -
 src/gpm-engine.c                           |   11 +-
 src/gpm-manager.c                          |   33 +--
 src/gpm-prefs-core.h                       |   57 ---
 src/gpm-prefs.c                            |  118 -------
 18 files changed, 354 insertions(+), 807 deletions(-)
---