[gnome-power-manager/polkit1: 42/49] Merge branch 'master' into polkit1

[Richard Hughes <rhughes src gnome org>]

commit 99c885ae6fc98d17c4820ebd69657e2d0fc4f56b
Merge: 7917e35... 7d0d294...
Author: Richard Hughes <richard hughsie com>
Date:   Tue Jun 16 10:07:11 2009 +0100

    Merge branch 'master' into polkit1

 Makefile.am                                      |    6 +-
 NEWS                                             |   60 +
 RELEASE                                          |   10 +-
 configure.ac                                     |    4 +-
 data/gnome-power-statistics.desktop.in.in        |    2 +-
 data/gpm-statistics.ui                           |   18 +
 data/icons/16x16/status/Makefile.am              |    1 +
 data/icons/16x16/status/gpm-battery-empty.png    |  Bin 0 -> 501 bytes
 data/icons/22x22/status/Makefile.am              |    1 +
 data/icons/22x22/status/gpm-battery-empty.png    |  Bin 0 -> 641 bytes
 data/icons/24x24/status/Makefile.am              |    1 +
 data/icons/24x24/status/gpm-battery-empty.png    |  Bin 0 -> 669 bytes
 data/icons/32x32/status/Makefile.am              |    1 +
 data/icons/32x32/status/gpm-battery-empty.png    |  Bin 0 -> 1311 bytes
 data/icons/48x48/status/Makefile.am              |    1 +
 data/icons/48x48/status/gpm-battery-empty.png    |  Bin 0 -> 2129 bytes
 data/icons/scalable/status/Makefile.am           |    1 +
 data/icons/scalable/status/gpm-battery-empty.svg |  448 +++++
 po/POTFILES.in                                   |    6 +-
 po/de.po                                         | 1300 ++++++-------
 po/et.po                                         |  200 +--
 po/nb.po                                         |  969 ++++------
 po/pa.po                                         | 1426 +++++++--------
 po/ta.po                                         |  962 +++++-----
 po/zh_CN.po                                      | 2247 ++++++++++++----------
 src/Makefile.am                                  |    1 +
 src/egg-idletime.c                               |  755 +++++---
 src/egg-idletime.h                               |   43 +-
 src/gpm-backlight.c                              |    4 -
 src/gpm-brightness-xrandr.c                      |   45 +-
 src/gpm-devicekit.c                              |   10 +
 src/gpm-engine.c                                 |  209 ++-
 src/gpm-feedback-widget.c                        |    5 +-
 src/gpm-graph-widget.c                           |  346 +++-
 src/gpm-graph-widget.h                           |    6 -
 src/gpm-idle.c                                   |  287 +++-
 src/gpm-idle.h                                   |    1 +
 src/gpm-manager.c                                |   43 +-
 src/gpm-notify.c                                 |    6 +-
 src/gpm-notify.h                                 |    3 +-
 src/gpm-prefs-core.c                             |   85 +-
 src/gpm-self-test.c                              |    2 +
 src/gpm-statistics.c                             |  125 +-
 src/gpm-tray-icon.c                              |   17 +-
 44 files changed, 5421 insertions(+), 4236 deletions(-)
---
diff --cc configure.ac
index e41fd9a,0c0911c..0ff2c05
--- a/configure.ac
+++ b/configure.ac
@@@ -99,9 -99,10 +99,9 @@@ CAIRO_REQUIRED=1.0.
  UNIQUE_REQUIRED=0.9.4
  LIBPANEL_REQUIRED=2.0.0
  XRANDR_REQUIRED=1.2.0
 -POLKIT_GNOME_REQUIRED=0.8
  CANBERRA_REQUIRED=0.10
  DEVKIT_REQUIRED=001
- DEVKIT_POWER_REQUIRED=007
+ DEVKIT_POWER_REQUIRED=008
  
  dnl ---------------------------------------------------------------------------
  dnl - Make above strings available for packaging files (e.g. rpm spec files)