[gnome-settings-daemon: 13/13] Merge the reusable-osd-window branch.

[Federico Mena Quintero <federico src gnome org>]

commit 641c6d86a599458f237701ee48de051f4582ba95
Merge: d663db1 0bea6c5
Author: Federico Mena Quintero <federico novell com>
Date:   Tue Jan 5 14:19:01 2010 -0600

    Merge the reusable-osd-window branch.
    
    Several plugins need to use an on-screen-display (OSD) window like the
    media-keys plugin does.  However, the media-keys plugin had a heavily
    hard-coded OSD window for its own purposes.
    
    This branch takes the basis of GsdMediaKeysWindow and turns it into a
    generic GsdOsdWindow.  You can use that widget as a normal GtkWindow
    and pack your widgets in it.  The GsdOsdWindow draws itself as a nice,
    semi-opaque, rounded rectangle and takes care of hiding itself after a
    timeout after it is shown.
    
    Now, GsdMediaKeysWindow is simply a subclass of GsdOsdWindow that
    knows the specifics of the media-keys plugin.
    
    The GsdOsdWindow will get used by the XRANDR plugin and hopefully
    others if they need it.
    
    Merge branch 'reusable-osd-window'

 plugins/common/Makefile.am                  |    4 +-
 plugins/common/gsd-osd-window.c             |  569 +++++++++++++++++++++++++++
 plugins/common/gsd-osd-window.h             |   94 +++++
 plugins/media-keys/Makefile.am              |    2 +
 plugins/media-keys/acme.ui                  |   44 +--
 plugins/media-keys/gsd-media-keys-manager.c |    2 +-
 plugins/media-keys/gsd-media-keys-window.c  |  432 ++------------------
 plugins/media-keys/gsd-media-keys-window.h  |    6 +-
 8 files changed, 730 insertions(+), 423 deletions(-)
---