[cheese: 164/164] Merge branch 'three-point-oh'

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

commit e8c6fd9af58568320d35c908e035b77bf2324d2d
Merge: c7295c9 18ad285
Author: daniel g. siegel <dgsiegel gnome org>
Date:   Fri Jul 16 22:59:54 2010 +0200

    Merge branch 'three-point-oh'
    
    Conflicts:
    	help/Makefile.am

 .gitignore                              |    1 +
 AUTHORS                                 |    5 +-
 MAINTAINERS                             |    4 -
 TODO                                    |   53 ++
 autogen.sh                              |    4 +-
 configure.ac                            |   62 +-
 data/Makefile.am                        |   10 +-
 data/cheese-about.ui                    |   56 ++
 data/cheese-actions.ui                  |  265 ++++++
 data/cheese-main-window.ui              |  239 +++++
 data/cheese-prefs.ui                    |   78 ++-
 data/cheese-ui.xml                      |   41 -
 data/cheese-viewport.json               |   49 +
 data/cheese.ui                          |  690 --------------
 data/effects/Hulk.png                   |  Bin 21118 -> 0 bytes
 data/effects/Makefile.am                |   43 +-
 data/effects/Mauve.png                  |  Bin 20317 -> 0 bytes
 data/effects/NoirBlanc.png              |  Bin 12765 -> 0 bytes
 data/effects/README                     |   44 +
 data/effects/Saturation.png             |  Bin 12482 -> 0 bytes
 data/effects/agingtv.effect.in          |    4 +
 data/effects/dicetv.effect.in           |    4 +
 data/effects/dicetv.png                 |  Bin 27289 -> 0 bytes
 data/effects/edgetv.effect.in           |    4 +
 data/effects/edgetv.png                 |  Bin 32141 -> 0 bytes
 data/effects/hulk.effect.in             |    4 +
 data/effects/identity.effect.in         |    4 +
 data/effects/identity.png               |  Bin 19816 -> 0 bytes
 data/effects/mauve.effect.in            |    4 +
 data/effects/noir.effect.in             |    4 +
 data/effects/optv.effect.in             |    4 +
 data/effects/quarktv.effect.in          |    4 +
 data/effects/radioactv.effect.in        |    4 +
 data/effects/saturation.effect.in       |    4 +
 data/effects/shagadelictv.effect.in     |    4 +
 data/effects/shagadelictv.png           |  Bin 27488 -> 0 bytes
 data/effects/streaktv.effect.in         |    4 +
 data/effects/vertigotv.effect.in        |    4 +
 data/effects/vertigotv.png              |  Bin 26408 -> 0 bytes
 data/effects/videoflip_h.png            |  Bin 19652 -> 0 bytes
 data/effects/videoflip_v.png            |  Bin 19558 -> 0 bytes
 data/effects/warptv.effect.in           |    4 +
 data/effects/warptv.png                 |  Bin 20932 -> 0 bytes
 docs/reference/Makefile.am              |    2 +-
 docs/reference/cheese-docs.xml          |   43 +
 docs/reference/cheese-sections.txt      |   70 ++
 docs/reference/cheese.types             |    4 +
 help/Makefile.am                        |    2 +-
 libcheese/Makefile.am                   |    2 +
 libcheese/cheese-camera.c               |  319 +++----
 libcheese/cheese-camera.h               |   27 +-
 libcheese/cheese-effect.c               |  146 +++
 libcheese/cheese-effect.h               |   60 ++
 po/POTFILES.in                          |   33 +-
 po/POTFILES.skip                        |    4 +
 src/Makefile.am                         |  106 +--
 src/cheese-commands-file.c              |  377 --------
 src/cheese-commands-help.c              |  131 ---
 src/cheese-commands.c                   |   39 -
 src/cheese-commands.h                   |   48 -
 src/cheese-countdown.vala               |   68 ++
 src/cheese-dbus-infos.xml               |    9 -
 src/cheese-dbus.c                       |  138 ---
 src/cheese-dbus.h                       |   58 --
 src/cheese-effect-chooser.c             |  349 -------
 src/cheese-effect-chooser.h             |   59 --
 src/cheese-effects-manager.vala         |  125 +++
 src/cheese-main.vala                    |  123 +++
 src/cheese-no-camera.c                  |   99 --
 src/cheese-no-camera.h                  |   34 -
 src/cheese-preferences.vala             |  241 +++++
 src/cheese-prefs-balance-scale.c        |  233 -----
 src/cheese-prefs-balance-scale.h        |   58 --
 src/cheese-prefs-burst-spinbox.c        |  186 ----
 src/cheese-prefs-burst-spinbox.h        |   56 --
 src/cheese-prefs-camera-combo.c         |  302 ------
 src/cheese-prefs-camera-combo.h         |   60 --
 src/cheese-prefs-dialog-widgets.c       |  114 ---
 src/cheese-prefs-dialog-widgets.h       |   62 --
 src/cheese-prefs-dialog.c               |  219 -----
 src/cheese-prefs-dialog.h               |   36 -
 src/cheese-prefs-resolution-combo.c     |  358 -------
 src/cheese-prefs-resolution-combo.h     |   69 --
 src/cheese-prefs-widget.c               |  148 ---
 src/cheese-prefs-widget.h               |   67 --
 src/cheese-ui.h                         |   95 --
 src/cheese-window.c                     | 1533 -------------------------------
 src/cheese-window.h                     |   67 --
 src/cheese-window.vala                  |  947 +++++++++++++++++++
 src/cheese.c                            |  174 ----
 src/thumbview/cheese-gconf.c            |  506 ++++++++++
 src/thumbview/cheese-gconf.h            |   67 ++
 src/{ => thumbview}/cheese-thumb-view.c |    0
 src/{ => thumbview}/cheese-thumb-view.h |    0
 src/{ => thumbview}/eog-thumb-nav.c     |    0
 src/{ => thumbview}/eog-thumb-nav.h     |    0
 src/{ => thumbview}/eog-thumbnail.c     |    0
 src/{ => thumbview}/eog-thumbnail.h     |    0
 src/vapi/cheese-common.deps             |    2 +
 src/vapi/cheese-common.vapi             |  197 ++++
 src/vapi/cheese-thumbview.vapi          |   12 +
 src/vapi/config.vapi                    |   10 +
 src/vapi/eogthumbnav.vapi               |   15 +
 tools/cheese-indent.c.cfg               |  352 +++++++
 tools/cheese-indent.cfg                 | 1160 ++++++++++++++++++++---
 tools/indent.sh                         |    2 +-
 106 files changed, 5149 insertions(+), 6378 deletions(-)
---
diff --cc help/Makefile.am
index c9c0ebf,8b17d5a..1f76bd5
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@@ -12,6 -12,6 +12,6 @@@ DOC_FIGURES = 
  	figures/cheese-preferences.jpg \
  	figures/cheese-share.jpg \
  	figures/cheese-wide.jpg
-- 
 -DOC_LINGUAS = ca cs de el en_GB es fi fr it nl oc pt_BR ru sl sv th zh_CN
++
 +DOC_LINGUAS = ca cs de el en_GB es fi fr it nl oc pa pt_BR ru sl sv th zh_CN