[cheese: 2/2] Merge branch 'gsettings-vala'

[Daniel G. Siegel <dgsiegel src gnome org>]

commit 2c4235b8d07e105af03b8a477a57e3cbbbc9f004
Merge: faee0d8 25aed01
Author: daniel g. siegel <dgsiegel gnome org>
Date:   Thu Nov 11 02:44:13 2010 +0100

    Merge branch 'gsettings-vala'

 INSTALL                           |   97 ++++++--
 configure.ac                      |   10 +-
 data/Makefile.am                  |   21 +--
 data/cheese-prefs.ui              |  127 ++++++----
 data/cheese.schemas.in            |  190 --------------
 data/org.gnome.Cheese.gschema.xml |  136 ++++++++++
 libcheese/Makefile.am             |    2 -
 libcheese/cheese-camera.c         |    4 +-
 libcheese/cheese-fileutil.c       |   13 +-
 libcheese/cheese-gconf.c          |  506 -------------------------------------
 libcheese/cheese-gconf.h          |   67 -----
 libcheese/cheese-gtk.symbols      |    2 -
 libcheese/cheese-widget-private.h |    4 +-
 libcheese/cheese-widget.c         |   35 ++--
 src/Makefile.am                   |    2 -
 src/cheese-countdown.vala         |    8 +-
 src/cheese-main.vala              |    2 +-
 src/cheese-preferences.vala       |   93 +++++---
 src/cheese-window.vala            |  112 ++++++---
 src/thumbview/cheese-gconf.c      |  506 -------------------------------------
 src/thumbview/cheese-gconf.h      |   67 -----
 src/vapi/cheese-common.vapi       |   37 ---
 22 files changed, 469 insertions(+), 1572 deletions(-)
---