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

[Richard Hughes <rhughes src gnome org>]

commit 5a51e663f6bab36d2d00be102d84dac989be0404
Merge: 9286af9... bcd0eb6...
Author: Richard Hughes <richard hughsie com>
Date:   Thu Jul 23 12:15:48 2009 +0100

    Merge branch 'composited-popup'

 data/gpm-feedback-widget.ui |   11 +-
 src/.gitignore              |    1 +
 src/Makefile.am             |    4 +-
 src/gpm-backlight.c         |   27 +-
 src/gpm-common.h            |   10 +-
 src/gpm-feedback-widget.c   |  239 --------------
 src/gpm-feedback-widget.h   |   59 ----
 src/gpm-main.c              |    1 +
 src/gpm-manager.c           |    1 -
 src/gpm-manager.h           |    4 -
 src/gpm-popup-window.c      |  721 +++++++++++++++++++++++++++++++++++++++++++
 src/gpm-popup-window.h      |   61 ++++
 src/gpm-statistics.c        |    2 +-
 13 files changed, 810 insertions(+), 331 deletions(-)
---