[cheese: 20/20] Merge branch 'cheese-window-refactor'

[Bastien Nocera <hadess src gnome org>]

commit 79d773de2c3e16113f84375e708d55c63830ce83
Merge: 37557b0 be6e8e3
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Feb 9 14:18:56 2010 +0000

    Merge branch 'cheese-window-refactor'

 Makefile.am                              |    2 +-
 configure.ac                             |    3 +
 data/cheese.ui                           |  724 +++++------
 libcheese/Makefile.am                    |   12 +-
 libcheese/cheese-camera-device-monitor.c |   41 +-
 libcheese/cheese-camera-device-monitor.h |    6 +-
 libcheese/cheese-camera-device.c         |   55 +-
 libcheese/cheese-camera-device.h         |    2 +-
 libcheese/cheese-camera.c                |   36 +-
 libcheese/cheese-gtk.symbols             |    8 +
 libcheese/cheese-marshal.list            |    1 +
 libcheese/cheese-widget-private.h        |   12 +-
 libcheese/cheese-widget.c                |   26 +-
 po/POTFILES.in                           |    5 +-
 src/Makefile.am                          |    9 +-
 src/cheese-commands-file.c               |  377 ++++++
 src/cheese-commands-help.c               |  131 ++
 src/cheese-commands.c                    |   39 +
 src/cheese-commands.h                    |   48 +
 src/cheese-dbus.c                        |   12 +-
 src/cheese-dbus.h                        |    3 +-
 src/cheese-ui.h                          |   90 ++
 src/cheese-window.c                      | 2066 ++++++++++--------------------
 src/cheese-window.h                      |   43 +-
 src/cheese.c                             |   13 +-
 tests/cheese-test-monitor.c              |    9 +-
 26 files changed, 1930 insertions(+), 1843 deletions(-)
---