diff -Nru cheese-3.5.4/aclocal.m4 cheese-3.5.5/aclocal.m4 --- cheese-3.5.4/aclocal.m4 2012-07-16 20:07:42.000000000 +0000 +++ cheese-3.5.5/aclocal.m4 2012-08-06 21:31:41.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -20,1790 +19,1742 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# gnome-common.m4 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # -# serial 3 -# - -dnl GNOME_COMMON_INIT - -AU_DEFUN([GNOME_COMMON_INIT], -[ - dnl this macro should come after AC_CONFIG_MACRO_DIR - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - dnl ensure that when the Automake generated makefile calls aclocal, - dnl it honours the $ACLOCAL_FLAGS environment variable - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - if test -n "$ac_macro_dir"; then - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" - fi +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.11' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) - AC_SUBST([ACLOCAL_AMFLAGS]) -], -[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}" -in your top-level Makefile.am, instead, where "m4" is the macro directory set -with AC_CONFIG_MACRO_DIR() in your configure.ac]]) +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) -AC_DEFUN([GNOME_DEBUG_CHECK], -[ - AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], - [turn on debugging]),, - [enable_debug=no]) +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.11.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - if test x$enable_debug = xyes ; then - AC_DEFINE(GNOME_ENABLE_DEBUG, 1, - [Enable additional debugging at the expense of performance and size]) - fi -]) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -dnl GNOME_MAINTAINER_MODE_DEFINES () -dnl define DISABLE_DEPRECATED -dnl -AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], -[ - AC_REQUIRE([AM_MAINTAINER_MODE]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - DISABLE_DEPRECATED="" - if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" - for DOMAIN in $DOMAINS; do - DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" - done - fi +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. - AC_SUBST(DISABLE_DEPRECATED) +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` ]) -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings -dnl For now, only works on GCC -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - AC_ARG_ENABLE(compile-warnings, - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) - - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi +# AM_CONDITIONAL -*- Autoconf -*- - warning_flags= - realsave_CFLAGS="$CFLAGS" +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - case "$enable_compile_warnings" in - no) - warning_flags= - ;; - minimum) - warning_flags="-Wall" - ;; - yes) - warning_flags="-Wall -Wmissing-prototypes" - ;; - maximum|error) - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($warning_flags) +# serial 9 - AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - WARN_CFLAGS="$warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -]) +# serial 10 -dnl For C++, do basically the same thing. +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac - - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -]) +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -mostlyclean-am: clean-gsettings-schemas + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) -.SECONDARY: $(gsettings_SCHEMAS) -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +]) -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) +# Generate code to set up dependency tracking. -*- Autoconf -*- -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) - -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, -dnl Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ([2.50]) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG +#serial 5 -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED +# AM_OUTPUT_DEPENDENCY_COMMANDS # ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) +# Do all the work for Automake. -*- Autoconf -*- -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -pkg_failed=no -AC_MSG_CHECKING([for $1]) +# serial 16 -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.62])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -$$1_PKG_ERRORS +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) -_PKG_TEXT]) - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) -_PKG_TEXT -To get pkg-config, see .]) - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -AC_DEFUN([YELP_HELP_INIT], -[ -AC_REQUIRE([AC_PROG_LN_S]) -m4_pattern_allow([AM_V_at]) -m4_pattern_allow([AM_V_GEN]) -m4_pattern_allow([AM_DEFAULT_VERBOSITY]) -AC_ARG_WITH([help-dir], - AC_HELP_STRING([--with-help-dir=DIR], - [path where help files are installed]),, - [with_help_dir='${datadir}/help']) -HELP_DIR="$with_help_dir" -AC_SUBST(HELP_DIR) +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) -AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) -if test x"$ITSTOOL" = x; then - AC_MSG_ERROR([itstool not found]) -fi +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) -AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) -if test x"$XMLLINT" = x; then - AC_MSG_ERROR([xmllint not found]) +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac fi +AC_SUBST(install_sh)]) -YELP_HELP_RULES=' -HELP_ID ?= -HELP_POT ?= -HELP_FILES ?= -HELP_EXTRA ?= -HELP_MEDIA ?= -HELP_LINGUAS ?= - -_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) -_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) -_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) -_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) -_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) -_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) -_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) -_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) -_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) -_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) -_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) -_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) -_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir [$]@); +# serial 2 -all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) -.PHONY: pot -pot: $(_HELP_POTFILE) -$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering -.PHONY: repo -repo: $(_HELP_POTFILE) - $(AM_V_at)for po in $(_HELP_POFILES); do \ - if test "x[$](_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ - msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ - done +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -$(_HELP_POFILES): - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi - $(AM_V_GEN)if ! test -f "[$]@"; then \ - (cd "$(dir [$]@)" && \ - $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ - mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \ - else \ - (cd "$(dir [$]@)" && \ - $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ - msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \ - rm "$(notdir [$]@).tmp"); \ - fi +# serial 5 -$(_HELP_MOFILES): %.mo: %.po - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(AM_V_GEN)msgfmt -o "[$]@" "$<" +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) -$(_HELP_LC_FILES): $(_HELP_LINGUAS) -$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) -$(_HELP_LC_STAMPS): %.stamp: %.mo -$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ - mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \ - if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ - (cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ - touch "[$]@" +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -.PHONY: clean-help -mostlyclean-am: $(if $(HELP_ID),clean-help) -clean-help: - rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) +# Check to see how 'make' treats includes. -*- Autoconf -*- -EXTRA_DIST ?= -EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) -EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) -EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) -EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -distdir: distdir-help-files -distdir-help-files: - @for lc in C $(HELP_LINGUAS); do \ - $(MKDIR_P) "$(distdir)/$$lc"; \ - for file in $(HELP_FILES); do \ - if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ - cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ - done; \ - done; \ +# serial 4 -.PHONY: check-help -check: check-help -check-help: - for lc in C $(_HELP_LINGUAS); do \ - if test -d "$$lc"; \ - then d=; \ - xmlpath="$$lc"; \ - else \ - d="$(srcdir)/"; \ - xmlpath="$$lc:$(srcdir)/$$lc"; \ - fi; \ - for page in $(HELP_FILES); do \ - echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ - $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ - done; \ - done +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -.PHONY: install-help -install-data-am: $(if $(HELP_ID),install-help) -install-help: - @for lc in C $(_HELP_LINGUAS); do \ - $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ - done - @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ - if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ - echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ - $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ - done; done - @for f in $(_HELP_C_EXTRA); do \ - lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ - if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ - echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ - $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ - done - @for f in $(HELP_MEDIA); do \ - for lc in C $(_HELP_LINGUAS); do \ - if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - mdir=`dirname "$$f"`; \ - if test "x$mdir" = "x."; then mdir=""; fi; \ - if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ - if test -f "$$d$$lc/$$f"; then \ - echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ - $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ - elif test "x$$lc" != "xC"; then \ - echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ - $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ - fi; \ - done; \ - done +# serial 6 -.PHONY: uninstall-help -uninstall-am: $(if $(HELP_ID),uninstall-help) -uninstall-help: - for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir`basename $$f`"; \ - rm -f "$$helpdir`basename $$f`"; \ - done; done - @for f in $(_HELP_C_EXTRA); do \ - lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir`basename $$f`"; \ - rm -f "$$helpdir`basename $$f`"; \ - done - @for f in $(HELP_MEDIA); do \ - for lc in C $(_HELP_LINGUAS); do \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir$$f"; \ - rm -f "$$helpdir$$f"; \ - done; \ - done; -' -AC_SUBST([YELP_HELP_RULES]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) +# AM_PROG_CC_C_O +# -------------- +# Like AC_PROG_CC_C_O, but changed for automake. +AC_DEFUN([AM_PROG_CC_C_O], +[AC_REQUIRE([AC_PROG_CC_C_O])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +dnl Make sure AC_PROG_CC is never called again, or it will override our +dnl setting of CC. +m4_define([AC_PROG_CC], + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) ]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) +# serial 6 -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac ]) -# AM_CONDITIONAL -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 4 -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -# serial 12 +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Free Software Foundation, Inc. # -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +# serial 5 - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi - cd .. - rm -rf conftest.dir + test "$[2]" = conftest.file + ) +then + # Ok. + : else - am_cv_$1_dependencies_compiler_type=none + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) +AC_MSG_RESULT(yes)]) + +# Copyright (C) 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# serial 1 -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS +# serial 2 +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -# Do all the work for Automake. -*- Autoconf -*- +# Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 +# serial 2 -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break fi -fi -AC_SUBST([CYGPATH_W]) +done +rm -rf conftest.dir -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +# Autoconf support for the Vala compiler -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +# Copyright (C) 2008, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# Check whether the Vala compiler exists in `PATH'. If it is found, the +# variable VALAC is set. Optionally a minimum release number of the +# compiler can be requested. +# +# AM_PROG_VALAC([MINIMUM-VERSION]) +# -------------------------------- +AC_DEFUN([AM_PROG_VALAC], +[AC_PATH_PROG([VALAC], [valac], []) + AS_IF([test -z "$VALAC"], + [AC_MSG_WARN([No Vala compiler found. You will not be able to compile .vala source files.])], + [AS_IF([test -n "$1"], + [AC_MSG_CHECKING([$VALAC is at least version $1]) + am__vala_version=`$VALAC --version | sed 's/Vala *//'` + AS_VERSION_COMPARE([$1], ["$am__vala_version"], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Vala $1 not found.])])])]) ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. +AC_PREREQ([2.50]) -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -# serial 1 +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi -AC_SUBST(install_sh)]) +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) -# serial 2 +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -# serial 5 +pkg_failed=no +AC_MSG_CHECKING([for $1]) -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -# Check to see how 'make' treats includes. -*- Autoconf -*- +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# serial 4 +$$1_PKG_ERRORS -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + +AC_DEFUN([YELP_HELP_INIT], +[ +AC_REQUIRE([AC_PROG_LN_S]) +m4_pattern_allow([AM_V_at]) +m4_pattern_allow([AM_V_GEN]) +m4_pattern_allow([AM_DEFAULT_VERBOSITY]) +AC_ARG_WITH([help-dir], + AC_HELP_STRING([--with-help-dir=DIR], + [path where help files are installed]),, + [with_help_dir='${datadir}/help']) +HELP_DIR="$with_help_dir" +AC_SUBST(HELP_DIR) + +AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) +AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) +if test x"$ITSTOOL" = x; then + AC_MSG_ERROR([itstool not found]) fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) +AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) +if test x"$XMLLINT" = x; then + AC_MSG_ERROR([xmllint not found]) +fi -# serial 6 +YELP_HELP_RULES=' +HELP_ID ?= +HELP_POT ?= +HELP_FILES ?= +HELP_EXTRA ?= +HELP_MEDIA ?= +HELP_LINGUAS ?= -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) +_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) +_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) +_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) +_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) +_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) +_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) +_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) +_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) +_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) +_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) +_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir [$]@); -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) -# serial 6 +.PHONY: pot +pot: $(_HELP_POTFILE) +$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) + $(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES) -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) +.PHONY: repo +repo: $(_HELP_POTFILE) + $(AM_V_at)for po in $(_HELP_POFILES); do \ + if test "x[$](_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ + msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ + done +$(_HELP_POFILES): + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi + $(AM_V_GEN)if ! test -f "[$]@"; then \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \ + else \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \ + rm "$(notdir [$]@).tmp"); \ + fi -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) +$(_HELP_MOFILES): %.mo: %.po + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_GEN)msgfmt -o "[$]@" "$<" -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +$(_HELP_LC_FILES): $(_HELP_LINGUAS) +$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) +$(_HELP_LC_STAMPS): %.stamp: %.mo +$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ + mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \ + if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ + (cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ + touch "[$]@" -# serial 1 +.PHONY: clean-help +mostlyclean-am: $(if $(HELP_ID),clean-help) +clean-help: + rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac +EXTRA_DIST ?= +EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) +EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) + +distdir: distdir-help-files +distdir-help-files: + @for lc in C $(HELP_LINGUAS); do \ + $(MKDIR_P) "$(distdir)/$$lc"; \ + for file in $(HELP_FILES); do \ + if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ + cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ + done; \ + done; \ + +.PHONY: check-help +check: check-help +check-help: + for lc in C $(_HELP_LINGUAS); do \ + if test -d "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(HELP_FILES); do \ + echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ + done; \ + done + + +.PHONY: install-help +install-data-am: $(if $(HELP_ID),install-help) +install-help: + @for lc in C $(_HELP_LINGUAS); do \ + $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ + done + @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + mdir=`dirname "$$f"`; \ + if test "x$mdir" = "x."; then mdir=""; fi; \ + if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ + if test -f "$$d$$lc/$$f"; then \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ + elif test "x$$lc" != "xC"; then \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + fi; \ + done; \ + done + +.PHONY: uninstall-help +uninstall-am: $(if $(HELP_ID),uninstall-help) +uninstall-help: + for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir$$f"; \ + rm -f "$$helpdir$$f"; \ + done; \ + done; +' +AC_SUBST([YELP_HELP_RULES]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) ]) -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# gnome-common.m4 # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# serial 3 +# -# serial 5 +dnl GNOME_COMMON_INIT -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +AU_DEFUN([GNOME_COMMON_INIT], +[ + dnl this macro should come after AC_CONFIG_MACRO_DIR + AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) -# _AM_SET_OPTION(NAME) -# -------------------- -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + dnl ensure that when the Automake generated makefile calls aclocal, + dnl it honours the $ACLOCAL_FLAGS environment variable + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" + if test -n "$ac_macro_dir"; then + ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" + fi -# _AM_SET_OPTIONS(OPTIONS) -# ------------------------ -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + AC_SUBST([ACLOCAL_AMFLAGS]) +], +[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}" +in your top-level Makefile.am, instead, where "m4" is the macro directory set +with AC_CONFIG_MACRO_DIR() in your configure.ac]]) -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +AC_DEFUN([GNOME_DEBUG_CHECK], +[ + AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], + [turn on debugging]),, + [enable_debug=no]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- + if test x$enable_debug = xyes ; then + AC_DEFINE(GNOME_ENABLE_DEBUG, 1, + [Enable additional debugging at the expense of performance and size]) + fi +]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl GNOME_MAINTAINER_MODE_DEFINES () +dnl define DISABLE_DEPRECATED +dnl +AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +[ + AC_REQUIRE([AM_MAINTAINER_MODE]) -# serial 5 + DISABLE_DEPRECATED="" + if test $USE_MAINTAINER_MODE = yes; then + DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" + for DOMAIN in $DOMAINS; do + DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" + done + fi -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac + AC_SUBST(DISABLE_DEPRECATED) +]) -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then +dnl GNOME_COMPILE_WARNINGS +dnl Turn on many useful compiler warnings +dnl For now, only works on GCC +AC_DEFUN([GNOME_COMPILE_WARNINGS],[ + dnl ****************************** + dnl More compiler warnings + dnl ****************************** - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + AC_ARG_ENABLE(compile-warnings, + AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], + [Turn on compiler warnings]),, + [enable_compile_warnings="m4_default([$1],[yes])"]) - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) + warnCFLAGS= + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + warning_flags= + realsave_CFLAGS="$CFLAGS" -# serial 2 + case "$enable_compile_warnings" in + no) + warning_flags= + ;; + minimum) + warning_flags="-Wall" + ;; + yes) + warning_flags="-Wall -Wmissing-prototypes" + ;; + maximum|error) + warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" + CFLAGS="$warning_flags $CFLAGS" + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + CFLAGS="$SAVE_CFLAGS" + AC_MSG_RESULT($has_option) + if test $has_option = yes; then + warning_flags="$warning_flags $option" + fi + unset has_option + unset SAVE_CFLAGS + done + unset option + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi + ;; + *) + AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) + ;; + esac + CFLAGS="$realsave_CFLAGS" + AC_MSG_CHECKING(what warning flags to pass to the C compiler) + AC_MSG_RESULT($warning_flags) -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl + AC_ARG_ENABLE(iso-c, + AC_HELP_STRING([--enable-iso-c], + [Try to warn if code is not ISO C ]),, + [enable_iso_c=no]) + + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + case " $CFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCFLAGS) + + WARN_CFLAGS="$warning_flags $complCFLAGS" + AC_SUBST(WARN_CFLAGS) ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl For C++, do basically the same thing. + +AC_DEFUN([GNOME_CXX_WARNINGS],[ + AC_ARG_ENABLE(cxx-warnings, + AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] + [Turn on compiler warnings.]),, + [enable_cxx_warnings="m4_default([$1],[minimum])"]) + + AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) + warnCXXFLAGS= + if test "x$GXX" != xyes; then + enable_cxx_warnings=no + fi + if test "x$enable_cxx_warnings" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) warnCXXFLAGS="-Wall -Wno-unused" ;; + esac -# serial 1 + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_cxx_warnings" = "xyes"; then + warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" + fi + fi + fi + AC_MSG_RESULT($warnCXXFLAGS) -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) + AC_ARG_ENABLE(iso-cxx, + AC_HELP_STRING([--enable-iso-cxx], + [Try to warn if code is not ISO C++ ]),, + [enable_iso_cxx=no]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) + complCXXFLAGS= + if test "x$enable_iso_cxx" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; + esac -# serial 3 + case " $CXXFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCXXFLAGS) -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) + WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" + AC_SUBST(WARN_CXXFLAGS) +]) -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl -# Check how to create a tarball. -*- Autoconf -*- +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas -# serial 2 +mostlyclean-am: clean-gsettings-schemas -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +.SECONDARY: $(gsettings_SCHEMAS) -# Autoconf support for the Vala compiler +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi -# Copyright (C) 2008, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) -# serial 4 +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) -# Check whether the Vala compiler exists in `PATH'. If it is found, the -# variable VALAC is set. Optionally a minimum release number of the -# compiler can be requested. -# -# AM_PROG_VALAC([MINIMUM-VERSION]) -# -------------------------------- -AC_DEFUN([AM_PROG_VALAC], -[AC_PATH_PROG([VALAC], [valac], []) - AS_IF([test -z "$VALAC"], - [AC_MSG_WARN([No Vala compiler found. You will not be able to compile .vala source files.])], - [AS_IF([test -n "$1"], - [AC_MSG_CHECKING([$VALAC is at least version $1]) - am__vala_version=`$VALAC --version | sed 's/Vala *//'` - AS_VERSION_COMPARE([$1], ["$am__vala_version"], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Vala $1 not found.])])])]) +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) ]) +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + m4_include([m4/gtk-doc.m4]) -m4_include([m4/gtkdoc_jh_check_xml_catalog.m4]) -m4_include([m4/gtkdoc_jh_path_xml_catalog.m4]) m4_include([m4/intltool.m4]) m4_include([m4/introspection.m4]) +m4_include([m4/jh-xsl.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) diff -Nru cheese-3.5.4/build-aux/compile cheese-3.5.5/build-aux/compile --- cheese-3.5.4/build-aux/compile 2012-07-16 19:58:27.000000000 +0000 +++ cheese-3.5.5/build-aux/compile 2012-07-30 14:21:08.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. +# Wrapper for compilers which do not understand `-c -o'. -scriptversion=2012-01-04.17; # UTC +scriptversion=2009-10-06.20; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software +# Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,186 +29,21 @@ # bugs to or send patches to # . -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l*) - lib=${1#-l} - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - set x "$@" "$dir/$lib.dll.lib" - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - set x "$@" "$dir/$lib.lib" - break - fi - done - IFS=$save_IFS - - test "$found" != yes && set x "$@" "$lib.lib" - shift - ;; - -L*) - func_file_conv "${1#-L}" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. +right script to run: please start by reading the file `INSTALL'. Report bugs to . EOF @@ -218,13 +53,11 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; esac ofile= cfile= +eat= for arg do @@ -233,8 +66,8 @@ else case $1 in -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -261,10 +94,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a + # If no `-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also + # `.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -273,7 +106,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# Note: use `[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -Nru cheese-3.5.4/build-aux/config.guess cheese-3.5.5/build-aux/config.guess --- cheese-3.5.4/build-aux/config.guess 2012-07-16 19:58:27.000000000 +0000 +++ cheese-3.5.5/build-aux/config.guess 2012-07-30 14:21:08.000000000 +0000 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-01-01' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -140,6 +138,29 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU/*) + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #ifdef __UCLIBC__ + # ifdef __UCLIBC_CONFIG_VERSION__ + LIBC=uclibc __UCLIBC_CONFIG_VERSION__ + # else + LIBC=uclibc + # endif + #else + # ifdef __dietlibc__ + LIBC=dietlibc + # else + LIBC=gnu + # endif + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -854,15 +875,22 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -874,59 +902,51 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -945,54 +965,54 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1320,6 +1340,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nru cheese-3.5.4/build-aux/config.sub cheese-3.5.5/build-aux/config.sub --- cheese-3.5.4/build-aux/config.sub 2012-07-16 19:58:27.000000000 +0000 +++ cheese-3.5.5/build-aux/config.sub 2012-07-30 14:21:08.000000000 +0000 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-01-01' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -132,6 +130,10 @@ os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -247,6 +249,7 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ @@ -254,7 +257,7 @@ | be32 | be64 \ | bfin \ | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ + | d10v | d30v | dlx | dsp16xx | dvp \ | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ @@ -319,7 +322,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -332,7 +335,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -355,6 +361,7 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ @@ -793,6 +800,24 @@ basic_machine=m68k-atari os=-mint ;; + mipsEE* | ee | ps2) + basic_machine=mips64r5900el-scei + case $os in + -linux*) + ;; + *) + os=-elf + ;; + esac + ;; + iop) + basic_machine=mipsel-scei + os=-irx + ;; + dvp) + basic_machine=dvp-scei + os=-elf + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -1351,7 +1376,7 @@ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ diff -Nru cheese-3.5.4/build-aux/depcomp cheese-3.5.5/build-aux/depcomp --- cheese-3.5.4/build-aux/depcomp 2012-07-16 19:58:28.000000000 +0000 +++ cheese-3.5.5/build-aux/depcomp 2012-07-30 14:21:08.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputting dependencies. + tmpdepfile Temporary file to use when outputing dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,18 +90,10 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' + cygpath_u="sed s,\\\\\\\\,/,g" depmode=msvisualcpp fi -if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 -fi - case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -166,12 +158,10 @@ ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as -## well. hp depmode also adds that space, but also prefixes the VPATH -## to the object. Take care to not repeat it in the output. +## well. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -415,52 +405,6 @@ rm -f "$tmpdepfile" ;; -msvc7) - if test "$libtool" = yes; then - showIncludes=-Wc,-showIncludes - else - showIncludes=-showIncludes - fi - "$@" $showIncludes > "$tmpdepfile" - stat=$? - grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The first sed program below extracts the file names and escapes - # backslashes for cygpath. The second sed program outputs the file - # name when reading, but also accumulates all include files in the - # hold buffer in order to output them again at the end. This only - # works with sed implementations that can handle large buffers. - sed < "$tmpdepfile" -n ' -/^Note: including file: *\(.*\)/ { - s//\1/ - s/\\/\\\\/g - p -}' | $cygpath_u | sort -u | sed -n ' -s/ /\\ /g -s/\(.*\)/ \1 \\/p -s/.\(.*\) \\/\1:/ -H -$ { - s/.*/ / - G - p -}' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvc7msys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -559,9 +503,7 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - # makedepend may prepend the VPATH from the source file name to the object. - # No need to regex-escape $object, excess matching of '.' is harmless. - sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + cat < "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff -Nru cheese-3.5.4/build-aux/install-sh cheese-3.5.5/build-aux/install-sh --- cheese-3.5.4/build-aux/install-sh 2012-07-16 19:58:27.000000000 +0000 +++ cheese-3.5.5/build-aux/install-sh 2012-07-30 14:21:08.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2009-04-28.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,10 +156,6 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac shift;; -T) no_target_directory=true;; @@ -190,10 +186,6 @@ fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac done fi @@ -208,11 +200,7 @@ fi if test -z "$dir_arg"; then - do_exit='(exit $ret); exit $ret' - trap "ret=129; $do_exit" 1 - trap "ret=130; $do_exit" 2 - trap "ret=141; $do_exit" 13 - trap "ret=143; $do_exit" 15 + trap '(exit $?); exit' 1 2 13 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -240,9 +228,9 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names starting with `-'. case $src in - -* | [=\(\)!]) src=./$src;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -264,7 +252,12 @@ echo "$0: no destination specified." >&2 exit 1 fi + dst=$dst_arg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst;; + esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -392,7 +385,7 @@ case $dstdir in /*) prefix='/';; - [-=\(\)!]*) prefix='./';; + -*) prefix='./';; *) prefix='';; esac @@ -410,7 +403,7 @@ for d do - test X"$d" = X && continue + test -z "$d" && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru cheese-3.5.4/build-aux/ltmain.sh cheese-3.5.5/build-aux/ltmain.sh --- cheese-3.5.4/build-aux/ltmain.sh 2012-07-16 19:58:09.000000000 +0000 +++ cheese-3.5.5/build-aux/ltmain.sh 2012-08-06 21:27:13.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,7 +41,6 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) -# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -70,7 +69,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 +# $progname: (GNU libtool) 2.4 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,9 +79,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 +VERSION=2.4 TIMESTAMP="" -package_revision=1.3337 +package_revision=1.3293 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -137,10 +136,15 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${EGREP="grep -E"} +: ${FGREP="grep -F"} +: ${GREP="grep"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} +: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -383,7 +387,7 @@ ;; *) save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} + IFS=: for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -767,8 +771,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1048,7 +1052,6 @@ opt_help=false opt_help_all=false opt_silent=: -opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1117,10 +1120,6 @@ opt_silent=false func_append preserve_args " $opt" ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2060,7 +2059,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3202,13 +3201,11 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' + func_show_eval "$old_striplib $oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3473,7 +3470,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3985,17 +3982,14 @@ # launches target application with the remaining arguments. func_exec_program () { - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done ;; - esac + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done func_exec_program_core \${1+\"\$@\"} } @@ -5063,15 +5057,9 @@ { EOF func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' + cat <<"EOF" } EOF @@ -5655,8 +5643,7 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6160,8 +6147,7 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6845,7 +6831,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7330,7 +7316,6 @@ # which has an extra 1 added just for fun # case $version_type in - # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7447,7 +7432,7 @@ versuffix="$major.$revision" ;; - linux) # correct to gnu/linux during the next big refactor + linux) func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8035,11 +8020,6 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8070,7 +8050,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; + *) func_apped perm_rpath " $libdir" ;; esac fi done @@ -8078,7 +8058,11 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" + if test -n "$hardcode_libdir_flag_spec_ld"; then + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9168,8 +9152,6 @@ esac done fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9279,8 +9261,7 @@ *.la) func_basename "$deplib" name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru cheese-3.5.4/build-aux/missing cheese-3.5.5/build-aux/missing --- cheese-3.5.4/build-aux/missing 2012-07-16 19:58:27.000000000 +0000 +++ cheese-3.5.5/build-aux/missing 2012-07-30 14:21:08.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2012-01-06.13; # UTC +scriptversion=2009-04-28.21; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,6 +84,7 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -121,6 +122,15 @@ # Not GNU programs, they don't have --version. ;; + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -216,7 +226,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG=\${$#} + eval LASTARG="\${$#}" case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -246,7 +256,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG=\${$#} + eval LASTARG="\${$#}" case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -308,6 +318,41 @@ touch $file ;; + tar*) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -Nru cheese-3.5.4/ChangeLog cheese-3.5.5/ChangeLog --- cheese-3.5.4/ChangeLog 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/ChangeLog 2012-08-06 21:33:35.000000000 +0000 @@ -1,13 +1,173 @@ -commit ec80afad748b49e408bf7ac9f3ad89990b2fd7af +commit a1ce90811934b18fc1a4a804cde3ff84ccc293c7 Author: David King -Date: Mon Jul 16 21:07:17 2012 +0100 +Date: Mon Aug 6 22:30:48 2012 +0100 + + Update NEWS for 3.5.5 release + +M NEWS +M configure.ac + +commit 1b026cbb3756a5db16ad204ea766475a73d57767 +Author: Tom Tryfonidis +Date: Mon Aug 6 17:54:48 2012 +0300 + + Updated Greek translation + +M po/el.po + +commit 93c456f18fc4f9892ea2c068f12d0dc09d30ffb2 +Author: David King +Date: Sun Aug 5 12:19:36 2012 +0100 + + Fix zh_CN translation markup + +M help/zh_CN/zh_CN.po + +commit 3884b12d3b8c3e8cfae41f16eedc5353dfbb5409 +Author: Nilamdyuti Goswami +Date: Fri Aug 3 14:33:10 2012 +0530 + + Assamese translation updated + +M po/as.po + +commit 16e9903574f8db55f99a8e1e4ff00f0dcc510332 +Author: Jiro Matsuzawa +Date: Thu Aug 2 11:50:51 2012 +0900 + + [l10n] Update Japanese translation + + Modify the About label + +M po/ja.po + +commit 0d53b648f830fff015e8803ca1056cae37a5e2b4 +Author: David King +Date: Wed Jul 25 17:01:11 2012 +0100 + + Set G_LOG_DOMAIN for libcheese and libcheese-gtk + + Define the logging domain for the GLib logging system, so that + messages + are prefixed with the name of the library. + +M Makefile.am + +commit 3cf79ed40b0d6e6faacba8e53168a7ab1efac396 +Author: Daniel Mustieles +Date: Mon Jul 30 12:47:48 2012 +0200 + + Updated Spanish translation + +M po/es.po + +commit 2c4b913ecf9b2a36490121c3b29846012ceb6deb +Author: Fran Diéguez +Date: Mon Jul 30 03:26:41 2012 +0200 + + Updated Galician translations + +M po/gl.po + +commit bc7c2e5064ba3a4a71ab00d9651edc7c0e5586dc +Author: Matej Urbančič +Date: Sun Jul 29 14:34:13 2012 +0200 + + Updated Slovenian translation + +M po/sl.po + +commit 97fa84fbe5451bcaf83076b890945cba81dd2e94 +Author: Alexandre Franke +Date: Sat Jul 28 15:41:31 2012 +0200 + + Fix missing translation for a string + + https://bugzilla.gnome.org/show_bug.cgi?id=680756 + +M libcheese/cheese-avatar-chooser.c + +commit 82ce4546d0919a105cdc472b563b332b8e64c5e0 +Author: Sweta Kothari +Date: Thu Jul 26 12:22:03 2012 +0530 + + Updated Gujarati Translations + +M po/gu.po + +commit 49741b7164bc93373e23884a79d7a1872b8eee30 +Author: Tobias Endrigkeit +Date: Sat Jul 21 12:27:43 2012 +0200 + + [l10n] Updated German translation + +M po/de.po + +commit 136426b722d318df0d29574f677ea7fb0ac6a4f8 +Author: Wylmer Wang +Date: Wed Jul 18 12:14:43 2012 +0800 + + Update Chinese translation + +M po/zh_CN.po + +commit b9e1f437f06329adc4252a4bfaa2b931b1bccb15 +Author: Wylmer Wang +Date: Tue Jul 17 22:58:42 2012 +0800 + + Revert "Update Chinese translation" + + This reverts commit bb7f852c935c0a8603b8f22f4e5d9cfd6a176c74. + + Conflicts: + po/zh_CN.po + +M help/zh_CN/zh_CN.po +M po/zh_CN.po + +commit b3fa913936d1955331786543cbe66dbc7a546776 +Author: Wylmer Wang +Date: Tue Jul 17 22:19:40 2012 +0800 + + update Chinese translation + +M po/zh_CN.po + +commit bb7f852c935c0a8603b8f22f4e5d9cfd6a176c74 +Author: Wylmer Wang +Date: Tue Jul 17 22:04:56 2012 +0800 + + Update Chinese translation + +M po/zh_CN.po + +commit bd0654b140fef3f0b1b8af246bdf3966792568f8 +Author: Chao-Hsiung Liao +Date: Tue Jul 17 14:44:29 2012 +0800 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + +M po/zh_HK.po +M po/zh_TW.po + +commit 6a6bb8deb23c0ff318bf63ae45b5e4ba378ffba9 +Author: David King +Date: Mon Jul 16 21:25:44 2012 +0100 + + Post-release bump to version 3.5.5 + +M configure.ac + +commit 20605ed0d709476e7d59c937478712761b42cedf +Author: David King +Date: Mon Jul 16 21:07:17 2012 +0100 Update NEWS for 3.5.4 release M NEWS M configure.ac -commit f1df4db385ef189a706708afedfde437417589c9 +commit fbaacce496bf789a83f774b15d11dc2d268c9fab Author: David King Date: Mon Jul 16 21:03:28 2012 +0100 diff -Nru cheese-3.5.4/cheese_vala.stamp cheese-3.5.5/cheese_vala.stamp --- cheese-3.5.4/cheese_vala.stamp 2012-07-16 19:59:34.000000000 +0000 +++ cheese-3.5.5/cheese_vala.stamp 2012-07-28 14:48:39.000000000 +0000 @@ -1 +0,0 @@ -stamp diff -Nru cheese-3.5.4/configure cheese-3.5.5/configure --- cheese-3.5.4/configure 2012-07-16 20:07:46.000000000 +0000 +++ cheese-3.5.5/configure 2012-08-06 21:31:42.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Cheese 3.5.4. +# Generated by GNU Autoconf 2.68 for Cheese 3.5.5. # # Report bugs to . # @@ -631,8 +631,8 @@ # Identity of this package. PACKAGE_NAME='Cheese' PACKAGE_TARNAME='cheese' -PACKAGE_VERSION='3.5.4' -PACKAGE_STRING='Cheese 3.5.4' +PACKAGE_VERSION='3.5.5' +PACKAGE_STRING='Cheese 3.5.5' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=cheese' PACKAGE_URL='http://projects.gnome.org/cheese/' @@ -813,7 +813,6 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE -am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -829,8 +828,6 @@ CC AM_BACKSLASH AM_DEFAULT_VERBOSITY -AM_DEFAULT_V -AM_V MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -1484,7 +1481,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Cheese 3.5.4 to adapt to many kinds of systems. +\`configure' configures Cheese 3.5.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1554,7 +1551,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Cheese 3.5.4:";; + short | recursive ) echo "Configuration of Cheese 3.5.5:";; esac cat <<\_ACEOF @@ -1590,7 +1587,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1695,7 +1692,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Cheese configure 3.5.4 +Cheese configure 3.5.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2064,7 +2061,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Cheese $as_me 3.5.4, which was +It was created by Cheese $as_me 3.5.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2885,7 +2882,7 @@ # Define the identity of the package. PACKAGE='cheese' - VERSION='3.5.4' + VERSION='3.5.5' # Some tools Automake needs. @@ -2906,19 +2903,19 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AMTAR='$${TAR-tar}' +# Always define AMTAR for backward compatibility. -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +AMTAR=${AMTAR-"${am_missing_run}tar"} +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval @@ -2949,33 +2946,6 @@ no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=0;; esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi AM_BACKSLASH='\' @@ -3821,7 +3791,6 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' - am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3846,7 +3815,6 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. - rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3906,7 +3874,7 @@ break fi ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) + msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -4166,8 +4134,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4' +macro_revision='1.3293' @@ -5012,11 +4980,6 @@ lt_cv_sys_max_cmd_len=196608 ;; - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5056,7 +5019,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -5485,7 +5448,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be glibc/ELF. +# This must be Linux ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -6126,13 +6089,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi case $host_os in @@ -6279,7 +6242,6 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -6668,7 +6630,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -*-*solaris*) +sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -6679,20 +6641,7 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; + yes*) LD="${LD-ld} -m elf64_sparc" ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7332,13 +7281,7 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&5 - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7349,7 +7292,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -7382,7 +7324,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -7404,9 +7345,7 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7810,22 +7749,7 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac + withval=$with_pic; pic_mode="$withval" else pic_mode=default fi @@ -7903,10 +7827,6 @@ - - - - test -z "$LN_S" && LN_S="ln -s" @@ -8366,9 +8286,7 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - if test -n "$lt_prog_compiler_pic"; then - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" - fi + lt_prog_compiler_pic='-Xcompiler -fPIC' ;; esac else @@ -8459,33 +8377,18 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + *Sun\ F* | *Sun*Fortran*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; - *Sun\ F* | *Sun*Fortran*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Qoption ld ' - ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; - *Intel*\ [CF]*Compiler*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *Portland\ Group*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; esac ;; esac @@ -8847,6 +8750,7 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9096,7 +9000,8 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld='-rpath $libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -9475,7 +9380,6 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -9521,7 +9425,6 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - else whole_archive_flag_spec='' fi @@ -9550,6 +9453,10 @@ hardcode_shlibpath_var=no ;; + freebsd1*) + ld_shlibs=no + ;; + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -9562,7 +9469,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) + freebsd2*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -9601,6 +9508,7 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10224,6 +10132,11 @@ + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10313,7 +10226,7 @@ case $host_os in aix3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10322,7 +10235,7 @@ ;; aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10387,7 +10300,7 @@ ;; bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -10526,7 +10439,7 @@ ;; dgux*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10534,6 +10447,10 @@ shlibpath_var=LD_LIBRARY_PATH ;; +freebsd1*) + dynamic_linker=no + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -10541,11 +10458,18 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[23].*) objformat=aout ;; + freebsd[123]*) objformat=aout ;; *) objformat=elf ;; esac fi - version_type=freebsd-$objformat + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + case $version_type in freebsd-elf*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' @@ -10556,10 +10480,16 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' need_version=yes ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10579,18 +10509,17 @@ ;; gnu*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -10651,7 +10580,7 @@ ;; interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -10667,7 +10596,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux else version_type=irix fi ;; @@ -10704,9 +10633,9 @@ dynamic_linker=no ;; -# This must be glibc/ELF. +# This must be Linux ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10754,14 +10683,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10792,7 +10717,7 @@ ;; newsos6) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -10861,7 +10786,7 @@ ;; solaris*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10886,7 +10811,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -10910,7 +10835,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -10941,7 +10866,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10951,7 +10876,7 @@ ;; uts4*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11733,8 +11658,6 @@ - - ac_config_commands="$ac_config_commands libtool" @@ -11750,6 +11673,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -11997,9 +11921,9 @@ # - If binary compatibility has been broken (eg removed or changed interfaces) # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -LIBCHEESE_LT_VERSION=6:3:3 +LIBCHEESE_LT_VERSION=6:4:3 -LIBCHEESE_GTK_LT_VERSION=22:7:1 +LIBCHEESE_GTK_LT_VERSION=22:8:1 #******************************************************************************* @@ -12767,6 +12691,7 @@ $CLUTTER_REQUIRED $CLUTTERGST_REQUIRED $UDEV_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12813,6 +12738,7 @@ $CLUTTER_REQUIRED $CLUTTERGST_REQUIRED $UDEV_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12832,7 +12758,7 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CHEESE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLIB_REQUIRED + CHEESE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GLIB_REQUIRED $GIO_REQUIRED $X11_REQUIRED $GOBJECT_REQUIRED @@ -12844,7 +12770,7 @@ $CLUTTERGST_REQUIRED $UDEV_REQUIRED" 2>&1` else - CHEESE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLIB_REQUIRED + CHEESE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GLIB_REQUIRED $GIO_REQUIRED $X11_REQUIRED $GOBJECT_REQUIRED @@ -12879,7 +12805,6 @@ Alternatively, you may set the environment variables CHEESE_CFLAGS and CHEESE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -12895,7 +12820,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else CHEESE_CFLAGS=$pkg_cv_CHEESE_CFLAGS CHEESE_LIBS=$pkg_cv_CHEESE_LIBS @@ -12947,6 +12871,7 @@ $LIBCANBERRA_REQUIRED $UDEV_REQUIRED $GNOME_VIDEO_EFFECTS_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12990,6 +12915,7 @@ $LIBCANBERRA_REQUIRED $UDEV_REQUIRED $GNOME_VIDEO_EFFECTS_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13009,7 +12935,7 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CHEESE_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GIO_REQUIRED + CHEESE_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GIO_REQUIRED $GTK_REQUIRED $GDK_REQUIRED $LIBGNOMEDESKTOP_REQUIRED @@ -13020,7 +12946,7 @@ $UDEV_REQUIRED $GNOME_VIDEO_EFFECTS_REQUIRED" 2>&1` else - CHEESE_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GIO_REQUIRED + CHEESE_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GIO_REQUIRED $GTK_REQUIRED $GDK_REQUIRED $LIBGNOMEDESKTOP_REQUIRED @@ -13053,7 +12979,6 @@ Alternatively, you may set the environment variables CHEESE_GTK_CFLAGS and CHEESE_GTK_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13069,7 +12994,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else CHEESE_GTK_CFLAGS=$pkg_cv_CHEESE_GTK_CFLAGS CHEESE_GTK_LIBS=$pkg_cv_CHEESE_GTK_LIBS @@ -13733,6 +13657,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13749,6 +13674,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13768,9 +13694,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` else - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 @@ -13785,7 +13711,6 @@ Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13801,7 +13726,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS @@ -13887,6 +13811,7 @@ + # check for the presence of the XML catalog # Check whether --with-xml-catalog was given. if test "${with_xml_catalog+set}" = set; then : @@ -13895,21 +13820,22 @@ with_xml_catalog=/etc/xml/catalog fi - jh_found_xmlcatalog=true - XML_CATALOG_FILE="$with_xml_catalog" + jh_found_xmlcatalog=true + XML_CATALOG_FILE="$with_xml_catalog" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML catalog ($XML_CATALOG_FILE)" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML catalog ($XML_CATALOG_FILE)" >&5 $as_echo_n "checking for XML catalog ($XML_CATALOG_FILE)... " >&6; } - if test -f "$XML_CATALOG_FILE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 + if test -f "$XML_CATALOG_FILE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } - else - jh_found_xmlcatalog=false - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + else + jh_found_xmlcatalog=false + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - fi + fi - # Extract the first word of "xmlcatalog", so it can be a program name with args. + # check for the xmlcatalog program + # Extract the first word of "xmlcatalog", so it can be a program name with args. set dummy xmlcatalog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -13950,15 +13876,15 @@ fi - if test "x$XMLCATALOG" = xno; then - jh_found_xmlcatalog=false - fi + if test "x$XMLCATALOG" = xno; then + jh_found_xmlcatalog=false + fi - if $jh_found_xmlcatalog; then - : - else - : - fi + if $jh_found_xmlcatalog; then + : + else + : + fi if test "x$enable_man" != "xno"; then : # Extract the first word of "xsltproc", so it can be a program name with args. @@ -14000,40 +13926,40 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML DTD V4.3 in XML catalog" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML DTD V4.3 in XML catalog" >&5 $as_echo_n "checking for DocBook XML DTD V4.3 in XML catalog... " >&6; } - if $jh_found_xmlcatalog && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.3//EN\" >&2"; } >&5 + if $jh_found_xmlcatalog && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.3//EN\" >&2"; } >&5 ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.3//EN" >&2) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } - have_docbookdtd=yes - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + have_docbookdtd=yes + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - have_docbookdtd=no - fi + have_docbookdtd=no + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XSL Stylesheets in XML catalog" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XSL Stylesheets in XML catalog" >&5 $as_echo_n "checking for DocBook XSL Stylesheets in XML catalog... " >&6; } - if $jh_found_xmlcatalog && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/html/refentry.xsl\" >&2"; } >&5 + if $jh_found_xmlcatalog && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/html/refentry.xsl\" >&2"; } >&5 ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/html/refentry.xsl" >&2) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } - have_docbookxsl=yes - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + have_docbookxsl=yes + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - have_docbookxsl=no - fi + have_docbookxsl=no + fi if test "x$have_xsltproc" = "xyes" -a "x$have_docbookdtd" = "xyes" \ -a "x$have_docbookxsl" = "xyes"; then : @@ -14346,6 +14272,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -15145,7 +15072,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Cheese $as_me 3.5.4, which was +This file was extended by Cheese $as_me 3.5.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15212,7 +15139,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Cheese config.status 3.5.4 +Cheese config.status 3.5.5 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -15349,7 +15276,6 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -15432,6 +15358,7 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -15487,7 +15414,6 @@ # Quote evaled strings. for var in SHELL \ ECHO \ -PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -15538,6 +15464,7 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ +hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -16341,8 +16268,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -16396,9 +16323,6 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO -# The PATH separator for the build system. -PATH_SEPARATOR=$lt_PATH_SEPARATOR - # The host system. host_alias=$host_alias host=$host @@ -16700,6 +16624,10 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld + # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator diff -Nru cheese-3.5.4/configure.ac cheese-3.5.5/configure.ac --- cheese-3.5.4/configure.ac 2012-07-16 20:07:06.000000000 +0000 +++ cheese-3.5.5/configure.ac 2012-08-06 21:30:36.000000000 +0000 @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.64]) AC_INIT([Cheese], - [3.5.4], + [3.5.5], [https://bugzilla.gnome.org/enter_bug.cgi?product=cheese], [cheese], [http://projects.gnome.org/cheese/]) @@ -41,8 +41,8 @@ # - If binary compatibility has been broken (eg removed or changed interfaces) # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -AC_SUBST([LIBCHEESE_LT_VERSION], [6:3:3]) -AC_SUBST([LIBCHEESE_GTK_LT_VERSION], [22:7:1]) +AC_SUBST([LIBCHEESE_LT_VERSION], [6:4:3]) +AC_SUBST([LIBCHEESE_GTK_LT_VERSION], [22:8:1]) #******************************************************************************* # Internationalization diff -Nru cheese-3.5.4/data/cheese.desktop.in cheese-3.5.5/data/cheese.desktop.in --- cheese-3.5.4/data/cheese.desktop.in 2012-07-16 20:07:58.000000000 +0000 +++ cheese-3.5.5/data/cheese.desktop.in 2012-08-06 21:31:46.000000000 +0000 @@ -11,4 +11,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=cheese X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=3.5.4 +X-GNOME-Bugzilla-Version=3.5.5 diff -Nru cheese-3.5.4/debian/changelog cheese-3.5.5/debian/changelog --- cheese-3.5.4/debian/changelog 2012-08-03 17:08:08.000000000 +0000 +++ cheese-3.5.5/debian/changelog 2012-08-08 21:16:31.000000000 +0000 @@ -1,3 +1,9 @@ +cheese (3.5.5-0ubuntu1) quantal; urgency=low + + * New upstream release. + + -- Robert Bruce Park Wed, 08 Aug 2012 16:16:18 -0500 + cheese (3.5.4-0ubuntu2) quantal; urgency=low * debian/control: diff -Nru cheese-3.5.4/docs/reference/html/annotation-glossary.html cheese-3.5.5/docs/reference/html/annotation-glossary.html --- cheese-3.5.4/docs/reference/html/annotation-glossary.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/annotation-glossary.html 2012-08-06 21:33:35.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -53,13 +53,13 @@

Free data after the code is done.

type
-

Override the parsed C type with given type

+

Override the parsed C type with given type.

transfer none

Don't free data after the code is done.

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/api-index-deprecated.html cheese-3.5.5/docs/reference/html/api-index-deprecated.html --- cheese-3.5.4/docs/reference/html/api-index-deprecated.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/api-index-deprecated.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -26,6 +26,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/api-index-full.html cheese-3.5.5/docs/reference/html/api-index-full.html --- cheese-3.5.4/docs/reference/html/api-index-full.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/api-index-full.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -410,6 +410,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/CheeseAvatarChooser.html cheese-3.5.5/docs/reference/html/CheeseAvatarChooser.html --- cheese-3.5.4/docs/reference/html/CheeseAvatarChooser.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/CheeseAvatarChooser.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -51,8 +51,8 @@ #include <cheese/cheese-avatar-chooser.h> CheeseAvatarChooser; -GtkWidget * cheese_avatar_chooser_new (void); -GdkPixbuf * cheese_avatar_chooser_get_picture (CheeseAvatarChooser *chooser); +GtkWidget * cheese_avatar_chooser_new (void); +GdkPixbuf * cheese_avatar_chooser_get_picture (CheeseAvatarChooser *chooser);
@@ -60,11 +60,11 @@ 
   GObject
    +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkWindow
-                                 +----GtkDialog
+         +----GtkWidget
+               +----GtkContainer
+                     +----GtkBin
+                           +----GtkWindow
+                                 +----GtkDialog
                                        +----CheeseAvatarChooser
@@ -72,12 +72,12 @@

Implemented Interfaces

CheeseAvatarChooser implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

Properties

-  "pixbuf"                   GdkPixbuf*            : Read
+  "pixbuf"                   GdkPixbuf*            : Read
@@ -99,7 +99,7 @@

cheese_avatar_chooser_new ()

-
GtkWidget *         cheese_avatar_chooser_new           (void);
+
GtkWidget *         cheese_avatar_chooser_new           (void);

Creates a new CheeseAvatarChooser dialogue.

@@ -115,7 +115,7 @@

cheese_avatar_chooser_get_picture ()

-
GdkPixbuf *         cheese_avatar_chooser_get_picture   (CheeseAvatarChooser *chooser);
+
GdkPixbuf *         cheese_avatar_chooser_get_picture   (CheeseAvatarChooser *chooser);

Returns the portion of image selected through the builtin cropping tool, after a picture has been captured on the webcam. @@ -129,7 +129,7 @@

Returns :

-a GdkPixbuf object, or NULL if no picture has been taken yet +a GdkPixbuf object, or NULL if no picture has been taken yet
@@ -139,15 +139,15 @@

Property Details

The "pixbuf" property

-
  "pixbuf"                   GdkPixbuf*            : Read
+
  "pixbuf"                   GdkPixbuf*            : Read

-A GdkPixbuf object representing the cropped area of the picture, or NULL. +A GdkPixbuf object representing the cropped area of the picture, or NULL.

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/CheeseCameraDevice.html cheese-3.5.5/docs/reference/html/CheeseCameraDevice.html --- cheese-3.5.4/docs/reference/html/CheeseCameraDevice.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/CheeseCameraDevice.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -160,7 +160,7 @@

device_node :

path to the device node of the video capture -device. [type filename] +device. [type filename] @@ -405,6 +405,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/CheeseCameraDeviceMonitor.html cheese-3.5.5/docs/reference/html/CheeseCameraDeviceMonitor.html --- cheese-3.5.4/docs/reference/html/CheeseCameraDeviceMonitor.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/CheeseCameraDeviceMonitor.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -215,6 +215,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/CheeseCamera.html cheese-3.5.5/docs/reference/html/CheeseCamera.html --- cheese-3.5.4/docs/reference/html/CheeseCamera.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/CheeseCamera.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -53,7 +53,7 @@ struct CheeseCameraClass; CheeseCamera; -CheeseCamera * cheese_camera_new (ClutterTexture *video_texture, +CheeseCamera * cheese_camera_new (ClutterTexture *video_texture, const gchar *camera_device_node, gint x_resolution, gint y_resolution); @@ -82,7 +82,7 @@ void cheese_camera_connect_effect_texture (CheeseCamera *camera, CheeseEffect *effect, - ClutterTexture *texture); + ClutterTexture *texture); void cheese_camera_play (CheeseCamera *camera); void cheese_camera_stop (CheeseCamera *camera); void cheese_camera_start_video_recording (CheeseCamera *camera, @@ -181,7 +181,7 @@

cheese_camera_new ()

-
CheeseCamera *      cheese_camera_new                   (ClutterTexture *video_texture,
+
CheeseCamera *      cheese_camera_new                   (ClutterTexture *video_texture,
                                                          const gchar *camera_device_node,
                                                          gint x_resolution,
                                                          gint y_resolution);

@@ -193,7 +193,7 @@
 
 
 
video_texture :

-a ClutterTexture
+a ClutterTexture
 
 
 
@@ -360,7 +360,7 @@
 
 
 
file :

-the device node path. [type filename]
+the device node path. [type filename]
 
 
 
@@ -495,7 +495,7 @@
 
void                cheese_camera_connect_effect_texture
                                                         (CheeseCamera *camera,
                                                          CheeseEffect *effect,
-                                                         ClutterTexture *texture);

+                                                         ClutterTexture *texture);

Connect the supplied texture to the camera, using effect.

@@ -514,7 +514,7 @@

texture :

-a ClutterTexture +a ClutterTexture @@ -573,7 +573,7 @@

filename :

the name of the video file to where the -recording will be saved. [type filename] +recording will be saved. [type filename] @@ -629,7 +629,7 @@

filename :

-name of the file to save a photo to. [type filename] +name of the file to save a photo to. [type filename] @@ -646,7 +646,7 @@ 
gboolean            cheese_camera_take_photo_pixbuf     (CheeseCamera *camera);

Take a photo with the camera and emit it in the ::capture-start signal as a -GdkPixbuf. +GdkPixbuf.

@@ -820,7 +820,7 @@

The "photo-taken" signal

void                user_function                      (CheeseCamera *camera,
-                                                        GdkPixbuf    *arg1,
+                                                        GdkPixbuf    *arg1,
                                                         gpointer      user_data)      : Action

Emitted when a photo was taken. @@ -891,6 +891,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/cheese.devhelp2 cheese-3.5.5/docs/reference/html/cheese.devhelp2 --- cheese-3.5.4/docs/reference/html/cheese.devhelp2 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/cheese.devhelp2 2012-08-06 21:33:35.000000000 +0000 @@ -114,7 +114,7 @@ - + diff -Nru cheese-3.5.4/docs/reference/html/CheeseEffect.html cheese-3.5.5/docs/reference/html/CheeseEffect.html --- cheese-3.5.4/docs/reference/html/CheeseEffect.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/CheeseEffect.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -247,7 +247,7 @@ @@ -291,6 +291,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/CheeseFileUtil.html cheese-3.5.5/docs/reference/html/CheeseFileUtil.html --- cheese-3.5.4/docs/reference/html/CheeseFileUtil.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/CheeseFileUtil.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -176,7 +176,7 @@ - @@ -199,7 +199,7 @@ - @@ -222,7 +222,7 @@ - @@ -250,6 +250,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/CheeseFlash.html cheese-3.5.5/docs/reference/html/CheeseFlash.html --- cheese-3.5.4/docs/reference/html/CheeseFlash.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/CheeseFlash.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -51,7 +51,7 @@ #include <cheese/cheese-flash.h> CheeseFlash; -CheeseFlash * cheese_flash_new (GtkWidget *parent); +CheeseFlash * cheese_flash_new (GtkWidget *parent); voidcheese_flash_fire (CheeseFlash *flash); @@ -60,10 +60,10 @@ 
   GObject
    +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkBin
-                           +----GtkWindow
+         +----GtkWidget
+               +----GtkContainer
+                     +----GtkBin
+                           +----GtkWindow
                                  +----CheeseFlash
@@ -71,12 +71,12 @@

Implemented Interfaces

CheeseFlash implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

Properties

-  "parent"                   GtkWidget*            : Write
+  "parent"                   GtkWidget*            : Write
@@ -98,7 +98,7 @@

cheese_flash_new ()

-
CheeseFlash *       cheese_flash_new                    (GtkWidget *parent);
+
CheeseFlash *       cheese_flash_new                    (GtkWidget *parent);

Create a new CheeseFlash, associated with the parent widget.

@@ -107,7 +107,7 @@
- @@ -139,9 +139,9 @@

Property Details

The "parent" property

-
  "parent"                   GtkWidget*            : Write
+
  "parent"                   GtkWidget*            : Write

-Parent GtkWidget for the CheeseFlash. The flash will be fired on the +Parent GtkWidget for the CheeseFlash. The flash will be fired on the screen where the parent widget is shown.

@@ -149,6 +149,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/cheese.html cheese-3.5.5/docs/reference/html/cheese.html --- cheese-3.5.4/docs/reference/html/cheese.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/cheese.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -33,7 +33,7 @@

cheese [option...]

-

Description

+

Description

cheese uses your webcam to take photos and videos, applies fancy special effects and lets you share the fun with others. It was written as @@ -46,10 +46,10 @@

-

Invocation

+

Invocation

cheese takes a list of options as arguments.

-

Options

+

Options

filename :

 name of the file containing the effect -specification. [type filename] +specification. [type filename]

Returns :

a new filename. [transfer full][type filename] +a new filename. [transfer full][type filename]

Returns :

the Cheese photo path. [transfer none][type filename] +the Cheese photo path. [transfer none][type filename]

Returns :

the Cheese video path. [transfer none][type filename] +the Cheese video path. [transfer none][type filename]

parent :

a parent GtkWidget +a parent GtkWidget
@@ -82,11 +82,11 @@
-

See also

+

See also

Cheese help manual

-

Author

+

Author

cheese was written by Daniel G. Siegel , Jaap A. Haitsma @@ -104,6 +104,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/cheese-Initializing-libcheese-gtk.html cheese-3.5.5/docs/reference/html/cheese-Initializing-libcheese-gtk.html --- cheese-3.5.4/docs/reference/html/cheese-Initializing-libcheese-gtk.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/cheese-Initializing-libcheese-gtk.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -87,6 +87,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/cheese-Initializing-libcheese.html cheese-3.5.5/docs/reference/html/cheese-Initializing-libcheese.html --- cheese-3.5.4/docs/reference/html/cheese-Initializing-libcheese.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/cheese-Initializing-libcheese.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -86,6 +86,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/cheese-overview.html cheese-3.5.5/docs/reference/html/cheese-overview.html --- cheese-3.5.4/docs/reference/html/cheese-overview.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/cheese-overview.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,6 +41,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/CheeseWidget.html cheese-3.5.5/docs/reference/html/CheeseWidget.html --- cheese-3.5.4/docs/reference/html/CheeseWidget.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/CheeseWidget.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -51,7 +51,7 @@ #include <cheese/cheese-widget.h> CheeseWidget; -GtkWidget * cheese_widget_new (void); +GtkWidget * cheese_widget_new (void); voidcheese_widget_get_error (CheeseWidget *widget, GError **error); enum CheeseWidgetState; @@ -62,9 +62,9 @@ 
   GObject
    +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkNotebook
+         +----GtkWidget
+               +----GtkContainer
+                     +----GtkNotebook
                            +----CheeseWidget
@@ -72,7 +72,7 @@

Implemented Interfaces

CheeseWidget implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

Properties

@@ -99,7 +99,7 @@

cheese_widget_new ()

-
GtkWidget *         cheese_widget_new                   (void);
+
GtkWidget *         cheese_widget_new                   (void);

Creates a new CheeseWidget. Make sure that you call cheese_gtk_init(), and check for errors during initialization, before calling this function. @@ -193,6 +193,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/index.html cheese-3.5.5/docs/reference/html/index.html --- cheese-3.5.4/docs/reference/html/index.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/index.html 2012-08-06 21:33:35.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for cheese 3.5.4 + for cheese 3.5.5 . The latest version of this documentation can be found on-line at http://developer.gnome.org/cheese/unstable/. @@ -74,6 +74,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/libcheese-gtk.html cheese-3.5.5/docs/reference/html/libcheese-gtk.html --- cheese-3.5.4/docs/reference/html/libcheese-gtk.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/libcheese-gtk.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -43,6 +43,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/libcheese.html cheese-3.5.5/docs/reference/html/libcheese.html --- cheese-3.5.4/docs/reference/html/libcheese.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/libcheese.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -50,6 +50,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru cheese-3.5.4/docs/reference/html/object-tree.html cheese-3.5.5/docs/reference/html/object-tree.html --- cheese-3.5.4/docs/reference/html/object-tree.html 2012-07-16 20:17:41.000000000 +0000 +++ cheese-3.5.5/docs/reference/html/object-tree.html 2012-08-06 21:33:35.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -25,14 +25,14 @@ 
     GObject
         GInitiallyUnowned
-            GtkWidget
-                GtkContainer
-                    GtkBin
-                        GtkWindow
-                            GtkDialog
+            GtkWidget
+                GtkContainer
+                    GtkBin
+                        GtkWindow
+                            GtkDialog
                                 CheeseAvatarChooser
                             CheeseFlash
-                    GtkNotebook
+                    GtkNotebook
                         CheeseWidget
         CheeseCameraDevice
         CheeseCameraDeviceMonitor
@@ -45,6 +45,6 @@
 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.18.1
 
 
\ No newline at end of file
diff -Nru cheese-3.5.4/docs/reference/html/running-cheese.html cheese-3.5.5/docs/reference/html/running-cheese.html
--- cheese-3.5.4/docs/reference/html/running-cheese.html	2012-07-16 20:17:41.000000000 +0000
+++ cheese-3.5.5/docs/reference/html/running-cheese.html	2012-08-06 21:33:35.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -28,6 +28,6 @@
 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.18.1
 
 
\ No newline at end of file
diff -Nru cheese-3.5.4/docs/reference/Makefile.in cheese-3.5.5/docs/reference/Makefile.in
--- cheese-3.5.4/docs/reference/Makefile.in	2012-07-16 20:17:41.000000000 +0000
+++ cheese-3.5.5/docs/reference/Makefile.in	2012-08-06 21:33:35.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -47,23 +47,22 @@
 subdir = docs/reference
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \
-	$(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \
 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/jh-xsl.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/cheese-config.h
 CONFIG_CLEAN_FILES = version.xml
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -88,12 +87,6 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
@@ -440,7 +433,6 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/gtk-doc.make:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -493,7 +485,9 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
 tags: TAGS
 TAGS:
 
@@ -582,15 +576,14 @@
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
+	    echo "$$grn$$dashes"; \
 	  else \
-	    col="$$red"; \
+	    echo "$$red$$dashes"; \
 	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes$$std"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -658,15 +651,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -899,7 +887,7 @@
 	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
 	@rm -rf xml html
 
 install-data-local:
@@ -935,7 +923,7 @@
 #
 # Require gtk-doc when making dist
 #
-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
+@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
 @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
 @ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make dist"
 @ENABLE_GTK_DOC_FALSE@	@false
diff -Nru cheese-3.5.4/gtk-doc.make cheese-3.5.5/gtk-doc.make
--- cheese-3.5.4/gtk-doc.make	2012-07-16 19:58:10.000000000 +0000
+++ cheese-3.5.5/gtk-doc.make	2012-08-06 21:27:13.000000000 +0000
@@ -200,7 +200,7 @@
 	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
 	@rm -rf xml html
 
 install-data-local:
@@ -237,7 +237,7 @@
 # Require gtk-doc when making dist
 #
 if ENABLE_GTK_DOC
-dist-check-gtkdoc:
+dist-check-gtkdoc: docs
 else
 dist-check-gtkdoc:
 	@echo "*** gtk-doc must be installed and enabled in order to make dist"
diff -Nru cheese-3.5.4/help/Makefile.in cheese-3.5.5/help/Makefile.in
--- cheese-3.5.4/help/Makefile.in	2012-07-16 20:07:48.000000000 +0000
+++ cheese-3.5.5/help/Makefile.in	2012-08-06 21:31:42.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -37,23 +37,22 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \
-	$(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \
 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/jh-xsl.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/cheese-config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -356,15 +355,10 @@
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
diff -Nru cheese-3.5.4/help/zh_CN/effects-apply.page cheese-3.5.5/help/zh_CN/effects-apply.page
--- cheese-3.5.4/help/zh_CN/effects-apply.page	2012-07-16 19:59:32.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/effects-apply.page	2012-08-05 11:19:32.000000000 +0000
@@ -14,37 +14,54 @@
       kittykat3756@gmail.com
     
 
-    Add fun effects to your photos and videos, like turning yourself green
-    or distorting the picture like a funhouse mirror.
+    给您的照片和视频添加有趣的效果，如让您自己变绿或让照片像游乐场哈哈镜一样扭曲变形。
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  Apply effects to photos and videos
+  给照片和视频添加特效
 
-  
You can apply fun, interesting effects to your photos and videos:

+  
您可以给您的图片和视频添加滑稽、有趣的效果：

   
-    
Click Effects.

+    
点击 效果。

     
-     
Select the effect you want to use by clicking one of the options.

-     
If you like, you can select multiple effects. For example, if you select
-     Hulk and Kung-Fu, the video will be altered to have a
-     green shade and will show a repeated image.

+     
通过点击其中一个选项，选择您想要使用的效果。

+     
如果喜欢，您可以选择多种效果。比如，如果您选择了 Hulk 和 功夫，视频将会变的有绿色阴影，也会展示出重复的图像。

     
     
-     
Click Effects to hide the effects menu and return to the
-     normal view.

+     
单击 效果 隐藏效果菜单，返回到正常视图。

     
   
 
-  
Cheese offers 34 effects, of which only 9 are shown on the first
-  page. Click Next Effects and Previous Effects to
-  navigate to the other pages.

+  
茄子 提供 34 种效果，其中 9 种在第一页显示。点击 下一批效果和 上一批效果 导向至其他页面。

 
   

-    Some of the effects, from left to right: Bulge, Edge and Mirror
+    其中一些效果，从左到右：Bulge，Edge 和 Mirror
     
   

 
-  
To deselect all effects, click Effects and
-  select No Effect.

+  
要取消所有效果，点击 效果 ，选择 无效果。

 
 
diff -Nru cheese-3.5.4/help/zh_CN/index.page cheese-3.5.5/help/zh_CN/index.page
--- cheese-3.5.4/help/zh_CN/index.page	2012-07-16 19:59:32.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/index.page	2012-08-05 11:19:32.000000000 +0000
@@ -14,26 +14,45 @@
       kittykat3756@gmail.com
     
 
-    Cheese lets you take photos and videos using your webcam. You can
-    even add special effects!
+    茄子(Cheese)可以让您使用摄像头拍照和录像。还可以添加特效哦！
 
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  
-    <media type="image" mime="image/png" src="figures/cheese.png" width="40" height="40">
-    </media>
-    Cheese Webcam Application
-  
+  <media type="image" mime="image/png" src="figures/cheese.png" width="40" height="40"> </media> Cheese 网络摄像头应用程序
  
   

-    Main features
+    主要功能
   

 
   

-    Preferences
+    首选项
   

 
   

-    Common problems and questions
+    常见问题
   

 
diff -Nru cheese-3.5.4/help/zh_CN/introduction.page cheese-3.5.5/help/zh_CN/introduction.page
--- cheese-3.5.4/help/zh_CN/introduction.page	2012-07-16 19:59:33.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/introduction.page	2012-08-05 11:19:32.000000000 +0000
@@ -17,22 +17,39 @@
       kittykat3756@gmail.com
     
 
-    Introduction to the Cheese webcam application.
+    关于 茄子 的使用介绍。
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  简介
+  使用介绍
 
-  
Cheese is a webcam application that lets you take photos and
-  record videos using your webcam. You can take multiple photos in quick
-  succession using the Burst mode and
-  apply special Effects to add a
-  personal touch to them.

-
-  
By default, Cheese starts in Photo mode, ready to
-  take a photo. You need to switch to
-  Video mode to record a video.

+  
茄子 是一款网络摄像头应用程序，您可以用它通过摄像头拍照和录像。 您可以使用 连拍 模式 快速连拍多张照片并应用 特殊 效果 来增加您的印迹。

 
-  
Cheese works with most webcams, but some older webcams may not
-  be supported.

+  
茄子 默认以 照片 模式启动，准备让您 拍摄照片。您需要切换到 视频 模式来 录制一段视频。

+
+  
Cheese 可以操作绝大多数网络摄像头，但有些老的摄像头可能不支持。

 
 
diff -Nru cheese-3.5.4/help/zh_CN/mode-wide.page cheese-3.5.5/help/zh_CN/mode-wide.page
--- cheese-3.5.4/help/zh_CN/mode-wide.page	2012-07-16 19:59:33.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/mode-wide.page	2012-08-05 11:19:32.000000000 +0000
@@ -17,28 +17,42 @@
 
     Change the position of the photo stream so that the webcam video feed
     is larger.
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  Make the webcam video preview bigger
+  放大摄像头视频预览
 
-  
The photo stream is where photos and videos appear after you have taken or
-  recorded them. By default, it is a horizontal strip at the bottom of the
-  Cheese window.

-
-  
You can make the photo stream appear as a vertical bar. This is useful if
-  you have a wide computer screen which is not very high; switching to a
-  vertical layout means that there is more room to display the video feed from
-  the webcam.

-
-  
To switch to a vertical layout, click Cheese
-  Wide Mode. To switch back to a horizontal layout, uncheck
-  the option.

+  
照片集是在您拍照或录像后照片和视频出现的地方。默认情况下，照片集是一条水平带，位于茄子窗口的底部。

+
+  
您也可以将照片集调整为垂直带。在屏幕高度不够的宽屏计算机上，这种视图很有用；切换到垂直布局则会有更多的空间来显示摄像头视频输入。

+
+  
要切换到垂直布局，点击茄子 宽屏模式。如果要切回到水平布局模式，取消选中该选项即可。

 
   
-    
Another way to increase the size of the webcam preview is to make
-    Cheese fullscreen. To do this, click
-    CheeseFullscreen or press
-    F11. To quit the fullscreen mode, press F11.

+    
增大摄像头预览尺寸的另一种方法是：让茄子全屏。要打开全屏，请点击茄子全屏或按下F11。要退出全屏模式，按下F11。

   
 
 
diff -Nru cheese-3.5.4/help/zh_CN/photo-delete.page cheese-3.5.5/help/zh_CN/photo-delete.page
--- cheese-3.5.4/help/zh_CN/photo-delete.page	2012-07-16 19:59:33.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/photo-delete.page	2012-08-05 11:19:32.000000000 +0000
@@ -15,34 +15,52 @@
       kittykat3756@gmail.com
     
 
-    Remove photos and videos that you no longer want to keep.
+    移除不想再保留的照片和视频。
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  Delete a photo or video
+  删除照片或视频
 
-  
If you no longer want a photo or video, you can permanently delete it:

+  
如果您不想再保存某些照片或视频，可以永久删除它：

 
   
     
-      
Find the photo or video that you want to delete in the photo stream at
-      the bottom of the Cheese window.

+      
在茄子窗口底部的照片集里面找到您想要删除的照片或视频。

     
     
-      
Right-click it and select Delete. Alternatively, click it
-      once to select it and press the Delete key.

+      
右键点击，选择删除。或者，单击想要删除的照片或视频，选中后按下 Delete 键。

     
     
-      
You will be asked if you want to permanently delete it. Confirm by
-      clicking Delete; you will not be able to recover the photo.

+      
此时，程序将询问您是否真的要永久删除它，单击删除确认。已删除的照片将无法恢复。

     
   
 
-  
If you are not sure whether you want to permanently delete the photo or
-  video, you can right click it and select Move to Trash instead.
-  This will move it to the computer's Trash folder.

+  
如果您不确定是否要永久删除这些照片或视频，您可以右键点击它，选择移入回收站。这会将它移动到计算机的回收站文件夹。

   
-    
Cheese does not have its own Trash folder and you cannot
-    access your computer's Trash folder from within Cheese.

+    
茄子没有自己单独的回收站文件夹，您无法在茄子软件中来访问计算机上的回收站文件夹。

   
 
 
diff -Nru cheese-3.5.4/help/zh_CN/photo-save.page cheese-3.5.5/help/zh_CN/photo-save.page
--- cheese-3.5.4/help/zh_CN/photo-save.page	2012-07-16 19:59:33.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/photo-save.page	2012-08-05 11:19:32.000000000 +0000
@@ -15,25 +15,41 @@
       kittykat3756@gmail.com
     
 
-    Save a photo or video in a different folder.
+    将照片或视频保存到另一文件夹。
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  Save a photo or video
+  保存照片或视频
 
-  
By default, Cheese saves the photos and videos in the
-  PicturesWebcam and
-  VideosWebcam folders in your user
-  folder.

-
-  
To save an image to a different location, right-click the image in the
-  photo stream and click Save As. Then, choose where you want to save
-  the image.

-
-  
Alternatively, open the folder where you want to keep the image using the
-  file manager, then drag it from the photo stream into that folder.

-
-  
A new copy of the image will be saved in the new location. The old version
-  will remain in the PicturesWebcam or
-  VideosWebcam folder.

+  
默认情况下，茄子将照片和视频文件保存到您的主目录下的图片和视频文件夹。

+
+  
要将照片保存到另一位置，请在照片集里右键点击它，选择另存为。然后，选择您想要保存该照片的位置。

+
+  
或者，通过文件管理器打开想要保存照片的文件夹，然后将照片从照片集拖入该文件夹。

+
+  
照片的一份新副本将保存到新位置。原来那份将留在图片Webcam或视频Webcam文件夹中。

 
 
diff -Nru cheese-3.5.4/help/zh_CN/photo-take.page cheese-3.5.5/help/zh_CN/photo-take.page
--- cheese-3.5.4/help/zh_CN/photo-take.page	2012-07-16 19:59:33.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/photo-take.page	2012-08-05 11:19:32.000000000 +0000
@@ -20,41 +20,56 @@
       kittykat3756@gmail.com
     
 
-    Use your webcam to take photos instead of videos.
+    用您的摄像头拍照而不是录像。
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  Take photos with the webcam
+  使用摄像头拍照
 
-  
Webcams can be used to take still photos, as well as videos. To take a
-  photo:

+  
除了录像之外，摄像头也可以用来拍照。要拍照：

 
   
     
-      
Make sure that you're in Photo mode. If you are, the button
-      in the main window will say Take a Photo.

-      
To switch to Photo mode, click the small photo button in the
-      bottom left of the window or click Cheese
-      Photo.

+      
确保茄子运行在拍照模式。如果是，主窗口的按钮会显示拍照。

+      
要切换到拍照模式，点击窗口左下方的小照片按钮或点击茄子照片。

     
     
-      
Click Take a Photo or press the spacebar.

+      
点击拍照或按下空格键。

     
     
-      
There will be a short countdown, followed by a flash, and then the
-      photo will appear in the photo stream at the bottom of the window.

+      
将会有短暂的倒计时，灯光一闪，“咔嚓”，照片就出现在窗口底部的照片集里面了。

     
   
 
-  
The photos in the photo stream are automatically saved in the
-  PicturesWebcam folder in your user
-  folder. They are saved in the JPEG (.jpg) format.

+  
照片集里面的照片将自动保存到主目录下的图片Webcam文件夹中。它们以 JPEG(.jpg) 格式保存。

 
-  
To cancel taking a photo after you have clicked Take a Photo,
-  press Esc before the countdown finishes.

+  
如果您在点击拍照后想取消拍照，请在倒计时结束前按下 Esc。

 
   
-   
To take multiple photos in rapid succession, use
-   Burst mode.

+   
如果要快速连拍多幅照片，请使用连拍模式。

   
 
 
diff -Nru cheese-3.5.4/help/zh_CN/photo-view.page cheese-3.5.5/help/zh_CN/photo-view.page
--- cheese-3.5.4/help/zh_CN/photo-view.page	2012-07-16 19:59:33.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/photo-view.page	2012-08-05 11:19:32.000000000 +0000
@@ -15,20 +15,40 @@
       kittykat3756@gmail.com
     
 
-    Photos and videos will automatically appear in the photo stream.
+    照片和视频会自动出现在照片集中。
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
 
-  View a photo or video that you took
+  查看您拍摄的照片或视频
 
-  
After you take a photo or record a video, it will appear in the photo
-  stream at the bottom of the window.

+  
您拍完照或录完视频后，照片或视频将出现在窗口底部的照片集里面。

 
-  
If you want to see a bigger version of a photo, or to play a video,
-  double-click it. This will open it in the default photo viewer or video player.

+  
如果您要看到照片的更大尺寸，或要播放录像，双击文件即可。该操作将通过默认图片浏览器或视频播放器打开它们。

 
-  
All of the photos and videos in the photo stream are saved in the
-  PicturesWebcam or
-  VideosWebcam folders in your user folder.

+  
照片集里所有的照片和视频都保存在主目录的图片Webcam 或 视频Webcam文件夹中。

 
 
diff -Nru cheese-3.5.4/help/zh_CN/pref-burst-mode.page cheese-3.5.5/help/zh_CN/pref-burst-mode.page
--- cheese-3.5.4/help/zh_CN/pref-burst-mode.page	2012-07-16 19:59:34.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/pref-burst-mode.page	2012-08-05 11:19:32.000000000 +0000
@@ -15,48 +15,63 @@
       kittykat3756@gmail.com
     
 
-    Burst mode takes several photos rapidly. Change your pose
-    in between each shot!
+    连拍模式会快速拍下多张照片。记得在拍照时多摆几个 Pose 呀！
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  Take multiple photos in quick succession
+  快速拍下多张照片
 
-  
You can use Burst mode to automatically take several photos in
-  one go, with a short pause between shots. It is particularly fun if you
-  change your pose in between photos! To use Burst mode:

+  
您可以使用 连拍模式 一次拍摄多张照片，拍摄时中间会有短暂停顿。如果拍照时不断改变您的姿势，将会很有趣！要启用连拍模式：

 
   
     
-      
Click Burst, the Take a Photo button will now say
-      Take Multiple Photos.

-      
Alternatively, click CheeseBurst.

+      
点击连拍，此时拍照按钮将会显示：拍摄多张照片。

+      
或者，点击茄子连拍。

     
     
-      
Click Take Multiple Photos or press the
-      spacebar.

-      
By default, four photos will be taken, with a three second delay and a
-      countdown between photos.

+      
点击拍摄多张照片 或按下空格键。

+      
默认情况下会连拍 4 张照片，照片之间有三秒钟延迟和倒计时。

     
   
 
-  
Press Esc if you want to stop Cheese from taking
-  photos at any point.

+  
任何时候您都可以按下Esc让Cheese停止拍照。

 
 

-  Change how many photos are taken and the delay between them
-  
You can change how many photos will be taken in each burst and the length
-  of the delay between the photos:

+  改变连拍照片的数量和延迟时间
+  
您可以修改在每次连拍时拍摄照片的数量和照片之间的延迟时间：

   
     
-      
Click EditPreferences.

+      
单击编辑首选项。

     
     
-      
Change the options under Burst mode and click Close.

+      
改变连拍模式下的选项，单击关闭。

     
   
   
-    
The delay is between the last photo taken and the start of the countdown
-    for the next photo, not between two photos.

+    
延迟是上张照片拍摄结束和下张照片倒计时开始之间的时间，不是两张照片拍摄间的时间。

   
 

 
diff -Nru cheese-3.5.4/help/zh_CN/pref-countdown.page cheese-3.5.5/help/zh_CN/pref-countdown.page
--- cheese-3.5.4/help/zh_CN/pref-countdown.page	2012-07-16 19:59:34.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/pref-countdown.page	2012-08-05 11:19:32.000000000 +0000
@@ -15,13 +15,35 @@
       kittykat3756@gmail.com
     
 
-    Remove the countdown so that photos are taken instantly.
+    移除倒计时可以立即拍摄照片。
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  Disable the <gui>Countdown</gui> before photos are taken
+  禁用拍摄照片前的<gui>倒计时</gui>
 
-  
By default, Cheese counts down from three before taking a
-  photo.  You can disable this feature by clicking Edit
-  Preferences and unchecking Countdown.

+  
默认情况下，茄子在拍照前从 3 开始倒计时。您可以通过点击编辑 首选项，取消选中倒计时，就可以禁用该功能。

 
 
diff -Nru cheese-3.5.4/help/zh_CN/pref-flash.page cheese-3.5.5/help/zh_CN/pref-flash.page
--- cheese-3.5.4/help/zh_CN/pref-flash.page	2012-07-16 19:59:34.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/pref-flash.page	2012-08-05 11:19:32.000000000 +0000
@@ -14,16 +14,37 @@
       kittykat3756@gmail.com
     
 
-    Stop the screen from flashing white when taking a photo.
+    拍照时禁用屏幕闪光。
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  Disable the flash
+  禁用闪光灯
 
-  
When you take a photo with Cheese, the computer screen briefly turns white.
-  This provides additional light.

+  
当您使用茄子拍照时，电脑屏幕会短暂变白。这会提供额外的亮光。

 
-  
To disable this feature, click
-  EditPreferences and uncheck Fire
-  Flash.

+  
要禁用该功能，请点击编辑首选项，取消选中闪光。

 
 
diff -Nru cheese-3.5.4/help/zh_CN/pref-fullscreen.page cheese-3.5.5/help/zh_CN/pref-fullscreen.page
--- cheese-3.5.4/help/zh_CN/pref-fullscreen.page	2012-07-16 19:59:34.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/pref-fullscreen.page	2012-08-05 11:19:32.000000000 +0000
@@ -9,24 +9,48 @@
       kittykat3756@gmail.com
     
 
-    Enable and disable fullscreen mode
+    启用和禁用全屏模式
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  Fullscreen
+  全屏
 
-  
To enable the fullscreen mode:

+  
要启用全屏模式：

 
   
-    
Select CheeseFullscreen

+    
或者，点击茄子全屏

   
 
-  
To disable the fullscreen mode:

+  
要禁用全屏模式：

 
   
-    
Select Leave Fullscreen

+    
选择 离开全屏

   
 
   
-    
You can also enable and disable fullscreen mode by pressing F11

+    
您也可以通过按 F11 启用和禁用全屏模式

   
 
diff -Nru cheese-3.5.4/help/zh_CN/pref-image-properties.page cheese-3.5.5/help/zh_CN/pref-image-properties.page
--- cheese-3.5.4/help/zh_CN/pref-image-properties.page	2012-07-16 19:59:34.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/pref-image-properties.page	2012-08-05 11:19:32.000000000 +0000
@@ -15,51 +15,70 @@
       kittykat3756@gmail.com
     
 
-    Adjust the saturation, contrast, brightness and hue to make photos and
-    videos look better.
+    调整饱和度、对比度、亮度和色度，让照片和视频效果更好。
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  My photos and videos look wrong
+  我的照片和视频看起来不正常
 
-  
If your photos or videos are too dark or the colors seem to be wrong, try
-  adjusting their saturation, contrast, brightness and hue:

+  
如果您的照片或视频太暗或颜色看起来失真，请尝试调整下它们的饱和度、对比度、亮度和色度。

 
   
     
-     
Click EditPreferences.

+     
单击编辑首选项。

     
     
-     
Under Image properties, change the sliders to find the best
-     settings for your webcam.

+     
在图像属性下，移动滑动条将摄像头调整到最佳设置。

     
     
-     
Click Close and check to see if the photos and videos look
-     better.

+     
单击关闭，查看照片和视频是否看起来好一些了。

     
   
 
   

-    Different options under <gui>Image properties</gui> (left to right):
-    applying brightness, contrast, hue and saturation
+    <gui>图像属性</gui>的各个选项(从左到右)分别是：应用亮度、对比度、色度和饱和度
     
   

 
   
     
-     Brightness
-     
Increasing the brightness will make the photos and videos lighter. However, if you are in a dark room, increasing the brightness might make the image look more noisy.

+     亮度
+     
增加亮度将会让照片和视频更亮。然而，如果您在暗室，增加照片亮度可能会让图片看起来噪点更多。

     
     
-     Contrast
-     
Setting a higher contrast will increase the difference between darker and lighter colors. If the image looks washed out, try increasing the contrast.

+     对比度
+     
设置较高的对比度将增加暗色和亮色的差别。如果图片看起来有漂洗过的感觉，请尝试增大对比度。

     
     
-     Hue
-     
Changing the hue of the image will add a tint to it. If image seems to be the wrong color (for example, too yellow), try changing the hue.

+     色彩值
+     
改变照片的色度将会给照片上色。如果照片看起来颜色不对劲（比如，太黄），请修改色度。

     
     
-     Saturation
-     
Reducing the saturation makes the image less colorful. If colors seem too harsh, reduce the saturation.

+     饱和度
+     
减少饱和度，会让照片看起来色彩变淡。如果颜色太鲜艳，请减少饱和度。

     
   
 
diff -Nru cheese-3.5.4/help/zh_CN/pref-photo-resolution.page cheese-3.5.5/help/zh_CN/pref-photo-resolution.page
--- cheese-3.5.4/help/zh_CN/pref-photo-resolution.page	2012-07-16 19:59:34.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/pref-photo-resolution.page	2012-08-05 11:19:32.000000000 +0000
@@ -15,31 +15,49 @@
       kittykat3756@gmail.com
     
 
-    The resolution of a video or photo determines how much detail you can
-    see in it, changing it will affect the file size.
+    视频或照片的分辨率决定了内容中包含多少的细节。修改分辨率会影响到文件的尺寸。
 
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  Change the capture resolution of your webcam
+  改变摄像头的分辨率
 
-  
Higher resolution generally means better quality images, but photos and
-  videos with higher resolution take up more space on your hard disk. High
-  resolution videos, in particular, take up a lot of space.

-
-  
If you want your images to take up less disk space, reduce the resolution
-  of your webcam. If you want better quality images, increase the resolution. To
-  change the webcam resolution:

+  
分辨率更高，图片质量一般会更好，但是高分辨率的照片和视频占用的硬盘空间也会更多。尤其是高分辨率的视频文件，会占用很大的硬盘空间。

+
+  
如果您想让照片占用较少的磁盘空间，可调低摄像头的分辨率。如果您想要更高质量的图片文件，就增大分辨率。要改变摄像头的分辨率：

 
   
     
-      
Click EditPreferences.

+      
单击编辑首选项。

     
     
-      
Choose a different resolution from the drop-down list. Some webcams
-      only support one resolution, so you may not have a choice.

+      
从下拉菜单中选择其他分辨率。一些摄像头只支持一种分辨率，所以您可能无法选择。

     
     
-      
Click Close.

+      
单击关闭。

     
   
 
diff -Nru cheese-3.5.4/help/zh_CN/video-record.page cheese-3.5.5/help/zh_CN/video-record.page
--- cheese-3.5.4/help/zh_CN/video-record.page	2012-07-16 19:59:34.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/video-record.page	2012-08-05 11:19:32.000000000 +0000
@@ -15,40 +15,54 @@
       kittykat3756@gmail.com
     
 
-    Use your webcam to record short movies for sharing with friends.
+    使用摄像头录制短片，与朋友分享。
+  
+    
+      arccos (L.Q)
+      boyermoore@gmail.com
+      2009
+    
+  
+    
+      YunQiang Su
+      wzssyqa@gmail.com
+      2010
+    
+  
+    
+      tuhaihe
+      1132321739qq@gmail.com
+      2012
+    
+  
+    
+      Wylmer Wang
+      wantinghard@gmail.com
+      2012
+    
   
 
-  Record a video
+  录制视频
 
-  
To record a video using your webcam:

+  
要使用摄像头录制视频：

 
   
     
-      
Make sure that you are in Video mode. If you are, the button
-      in the middle of the window will say Start Recording.

-      
You can switch to Video mode by clicking the button in the
-      main window or by clicking CheeseVideo.

+      
确保您在视频模式模式下。如果已在该模式下，窗口中间的按钮会显示：开始录像。

+      
您可以通过点击主窗口上的按钮或点击茄子视频切换到视频模式。

     
     
-      
Click Start Recording, or press the spacebar.
-      Cheese will start recording from your webcam.

+      
点击开始录像，或按下空格键。茄子 将开始用摄像头录像。

     
     
-     
To stop recording, click Stop Recording or press
-     Esc.

+     
要停止录像，点击停止录像或按下Esc键。

     
   
 
-  
Videos are saved in the Ogg Theora (.ogv) format.

+  
视频将被保存为 Ogg Theora(.ogv) 格式。

 
-  
After you have stopped recording, the video will automatically appear in
-  the photo stream at the bottom of the Cheese window. From there,
-  you can play back the video, upload it to a
-  social network, post it on your blog or YouTube channel, or share it with
-  friends by email.

-
-  
If you have problems sharing a video with people using other operating
-  systems (like Windows or Mac OS), you may need to
-  convert it to a different format.

+  
当您停止录像后，视频将会自动出现在茄子窗口底部的照片集里面。在照片集中，您可以回放视频，将视频上传到社交网络，发布到您的博客或 Youtube 频道，或者通过邮件与朋友分享。

+
+  
如果您在与使用其他操作系统(如 Windows 或 Mac OS)的朋友分享视频时出现问题，您可能需要将视频转换成其他格式。

 
 
diff -Nru cheese-3.5.4/help/zh_CN/zh_CN.po cheese-3.5.5/help/zh_CN/zh_CN.po
--- cheese-3.5.4/help/zh_CN/zh_CN.po	2011-09-28 05:43:49.000000000 +0000
+++ cheese-3.5.5/help/zh_CN/zh_CN.po	2012-08-05 11:19:28.000000000 +0000
@@ -1,1121 +1,808 @@
 # Simplified Chinese translation to cheese-help.
 # Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as cheese package.
-#
 # ccrecall , 2009.
 # arccos (L.Q) , 2009.
+# YunQiang Su , 2010.
+# tuhaihe <1132321739qq@gmail.com>, 2012.
+# Wylmer Wang , 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: cheese master\n"
-"POT-Creation-Date: 2010-07-22 16:08+0000\n"
-"PO-Revision-Date: 2010-09-05 03:24+0800\n"
-"Last-Translator: YunQiang Su \n"
+"POT-Creation-Date: 2012-07-02 03:21+0000\n"
+"PO-Revision-Date: 2012-02-25 20:24+0800\n"
+"Last-Translator: Wylmer Wang \n"
 "Language-Team: Chinese (simplified) \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/cheese.xml:214(None)
-msgid ""
-"@@image: 'figures/cheese-main.jpg'; md5=fbe9e9d1c9edb74f2db4ca25119f1c8b"
+#. Put one translator per line, in the form NAME , YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
 msgstr ""
-"@@image: 'figures/cheese-main.jpg'; md5=fbe9e9d1c9edb74f2db4ca25119f1c8b"
+"ccrecall \n"
+"arccos (L.Q) , 2009\n"
+"YunQiang Su , 2010\n"
+"tuhaihe <1132321739qq@gmail.com>, 2012\n"
+"Wylmer Wang , 2012"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:25(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/cheese.png' md5='e801510f287b3db068beb2daf8989124'"
+msgstr ""
+"external ref='figures/cheese.png' md5='e801510f287b3db068beb2daf8989124'"
+
+#: C/index.page:9(credit/name) C/effects-apply.page:9(credit/name)
+#: C/introduction.page:12(credit/name) C/mode-wide.page:10(credit/name)
+#: C/photo-delete.page:10(credit/name) C/photo-save.page:10(credit/name)
+#: C/photo-take.page:15(credit/name) C/photo-view.page:10(credit/name)
+#: C/pref-burst-mode.page:10(credit/name)
+#: C/pref-countdown.page:10(credit/name) C/pref-flash.page:9(credit/name)
+#: C/pref-image-properties.page:10(credit/name)
+#: C/pref-photo-resolution.page:10(credit/name)
+#: C/video-record.page:10(credit/name)
+msgid "Julita Inca"
+msgstr "Julita Inca"
+
+#: C/index.page:11(credit/years) C/effects-apply.page:11(credit/years)
+#: C/introduction.page:14(credit/years) C/mode-wide.page:12(credit/years)
+#: C/photo-delete.page:12(credit/years) C/photo-save.page:12(credit/years)
+#: C/photo-take.page:17(credit/years) C/photo-view.page:12(credit/years)
+#: C/pref-burst-mode.page:12(credit/years)
+#: C/pref-countdown.page:12(credit/years) C/pref-flash.page:11(credit/years)
+#: C/pref-image-properties.page:12(credit/years)
+#: C/pref-photo-resolution.page:12(credit/years)
+#: C/video-record.page:12(credit/years)
+msgid "2011"
+msgstr "2011"
+
+#: C/index.page:15(credit/name) C/effects-apply.page:14(credit/name)
+#: C/introduction.page:17(credit/name) C/mode-wide.page:15(credit/name)
+#: C/photo-delete.page:15(credit/name) C/photo-save.page:15(credit/name)
+#: C/photo-take.page:20(credit/name) C/photo-view.page:15(credit/name)
+#: C/pref-burst-mode.page:15(credit/name)
+#: C/pref-countdown.page:15(credit/name) C/pref-flash.page:14(credit/name)
+#: C/pref-fullscreen.page:9(credit/name)
+#: C/pref-image-properties.page:15(credit/name)
+#: C/pref-photo-resolution.page:15(credit/name)
+#: C/video-record.page:15(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/index.page:19(info/desc)
+msgid ""
+"Cheese lets you take photos and videos using your webcam. You can even add "
+"special effects!"
+msgstr "茄子(Cheese)可以让您使用摄像头拍照和录像。还可以添加特效哦！"
+
+#: C/index.page:24(page/title)
+msgid ""
+"  Cheese Webcam Application"
+msgstr ""
+"  Cheese 网络摄像头应用程序"
+
+#: C/index.page:31(section/title)
+msgid "Main features"
+msgstr "主要功能"
+
+#: C/index.page:35(section/title)
+msgid "Preferences"
+msgstr "首选项"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/cheese.xml:231(None)
-msgid ""
-"@@image: 'figures/cheese-wide.jpg'; md5=c2db63840f221557a7a4bbdde96847bc"
-msgstr ""
-"@@image: 'figures/cheese-wide.jpg'; md5=c2db63840f221557a7a4bbdde96847bc"
+#: C/index.page:39(section/title)
+msgid "Common problems and questions"
+msgstr "常见问题"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/cheese.xml:253(None)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/effects-apply.page:45(media)
+msgctxt "_"
 msgid ""
-"@@image: 'figures/cheese-effects.jpg'; md5=cf2e23befd055fa0bed70b19f19657c9"
+"external ref='figures/effects.png' md5='27139b3d1500c8caac548fab39e05c28'"
 msgstr ""
-"@@image: 'figures/cheese-effects.jpg'; md5=cf2e23befd055fa0bed70b19f19657c9"
+"external ref='figures/effects.png' md5='27139b3d1500c8caac548fab39e05c28'"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/cheese.xml:344(None)
+#: C/effects-apply.page:18(info/desc)
 msgid ""
-"@@image: 'figures/cheese-fullscreen.jpg'; "
-"md5=7836db68a654278e984a554fccd09283"
+"Add fun effects to your photos and videos, like turning yourself green or "
+"distorting the picture like a funhouse mirror."
 msgstr ""
-"@@image: 'figures/cheese-fullscreen.jpg'; "
-"md5=7836db68a654278e984a554fccd09283"
+"给您的照片和视频添加有趣的效果，如让您自己变绿或让照片像游乐场哈哈镜一样扭曲"
+"变形。"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/cheese.xml:441(None)
-msgid ""
-"@@image: 'figures/cheese-preferences.jpg'; "
-"md5=ebcfbcb6cb2ed034304c0410a34eb07c"
-msgstr ""
-"@@image: 'figures/cheese-preferences.jpg'; "
-"md5=ebcfbcb6cb2ed034304c0410a34eb07c"
+#: C/effects-apply.page:22(page/title)
+msgid "Apply effects to photos and videos"
+msgstr "给照片和视频添加特效"
+
+#: C/effects-apply.page:24(page/p)
+msgid "You can apply fun, interesting effects to your photos and videos:"
+msgstr "您可以给您的图片和视频添加滑稽、有趣的效果："
+
+#: C/effects-apply.page:26(item/p)
+msgid "Click Effects."
+msgstr "点击 效果。"
+
+#: C/effects-apply.page:28(item/p)
+msgid "Select the effect you want to use by clicking one of the options."
+msgstr "通过点击其中一个选项，选择您想要使用的效果。"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/cheese.xml:563(None)
+#: C/effects-apply.page:29(item/p)
 msgid ""
-"@@image: 'figures/cheese-share.jpg'; md5=8b94ccb434e68608677814d3666d08cf"
+"If you like, you can select multiple effects. For example, if you select "
+"Hulk and Kung-Fu, the video will be altered to have a "
+"green shade and will show a repeated image."
 msgstr ""
-"@@image: 'figures/cheese-share.jpg'; md5=8b94ccb434e68608677814d3666d08cf"
+"如果喜欢，您可以选择多种效果。比如，如果您选择了 Hulk 和 功夫"
+"，视频将会变的有绿色阴影，也会展示出重复的图像。"
 
-#: C/cheese.xml:25(title)
-msgid "Cheese Manual"
-msgstr "Cheese 手册"
+#: C/effects-apply.page:34(item/p)
+msgid ""
+"Click Effects to hide the effects menu and return to the normal "
+"view."
+msgstr "单击 效果 隐藏效果菜单，返回到正常视图。"
 
-#: C/cheese.xml:27(para)
+#: C/effects-apply.page:39(page/p)
 msgid ""
-"Cheese uses your webcam to take photos and "
-"videos, applies fancy special effects and lets you share the fun with others."
+"Cheese offers 34 effects, of which only 9 are shown on the first "
+"page. Click Next Effects and Previous Effects to "
+"navigate to the other pages."
 msgstr ""
-"Cheese使用您的摄像头获取照片和视频，应用精美的特效"
-"并让您和他人分享乐趣。"
-
-#: C/cheese.xml:33(year)
-msgid "2007-2009"
-msgstr "2007-2009"
+"茄子 提供 34 种效果，其中 9 种在第一页显示。点击 下一批效果和 上一批效果 导向至其他页面。"
 
-#: C/cheese.xml:34(holder)
-msgid "daniel g. siegel (dgsiegel@gnome.org)"
-msgstr "daniel g. siegel (dgsiegel@gmail.com)"
+#: C/effects-apply.page:44(figure/title)
+msgid "Some of the effects, from left to right: Bulge, Edge and Mirror"
+msgstr "其中一些效果，从左到右：Bulge，Edge 和 Mirror"
 
-#: C/cheese.xml:35(holder)
-msgid "Jaap A. Haitsma (jaap@haitsma.org)"
-msgstr "Jaap A. Haitsma (jaap@haitsma.org)"
+#: C/effects-apply.page:48(note/p)
+msgid ""
+"To deselect all effects, click Effects and select No Effect."
+msgstr "要取消所有效果，点击 效果 ，选择 无效果。"
 
-#: C/cheese.xml:36(holder)
-msgid "Filippo Argiolas (fargiolas@gnome.org)"
-msgstr "Filippo Argiolas (fargiolas@gnome.org)"
+#: C/introduction.page:21(info/desc)
+msgid "Introduction to the Cheese webcam application."
+msgstr "关于 茄子 的使用介绍。"
 
-#: C/cheese.xml:52(publishername)
-msgid "Felix Kaser (f.kaser@gmx.net)"
-msgstr "Felix Kaser (f.kaser@gmx.net)"
+#: C/introduction.page:24(page/title)
+msgid "Introduction"
+msgstr "使用介绍"
 
-#: C/cheese.xml:2(para)
+#: C/introduction.page:26(page/p)
 msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this link or "
-"in the file COPYING-DOCS distributed with this manual."
+"Cheese is a webcam application that lets you take photos and "
+"record videos using your webcam. You can take multiple photos in quick "
+"succession using the Burst mode and apply special Effects to add a personal touch to them."
 msgstr ""
-"对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software "
-"Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.1 或更高版本，该许可证没"
-"有固定的部分、没有封面和背页文本。您可以在此链接上或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副"
-"本。"
+"茄子 是一款网络摄像头应用程序，您可以用它通过摄像头拍照和录像。 "
+"您可以使用 连拍 模式 快速连拍多张照片并应用 特殊 效果 来增加您的印迹。"
 
-#: C/cheese.xml:12(para)
+#: C/introduction.page:32(page/p)
 msgid ""
-"This manual is part of a collection of GNOME manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
+"By default, Cheese starts in Photo mode, ready to "
+"take a photo. You need to switch to "
+"Video mode to record a video."
 msgstr ""
-"本手册是在 GFDL 许可之下分发的 GNOME 手册集合的一部分。如果想要单独分发此手"
-"册，可以在手册中添加该许可证的一份副本然后分发，如该许可证的第 6 部分所述。"
+"茄子 默认以 照片 模式启动，准备让您 "
+"拍摄照片。您需要切换到 "
+"视频 模式来 录制一段视频。"
 
-#: C/cheese.xml:19(para)
+#: C/introduction.page:36(page/p)
 msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any GNOME "
-"documentation, and the members of the GNOME Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
+"Cheese works with most webcams, but some older webcams may not be "
+"supported."
 msgstr ""
-"各个公司使用的许多用于区别它们产品和服务的名称都声明为商标。在所有的 GNOME 文"
-"档以及 GNOME 文档项目的成员中，这些名称都是以全大写字母或首字母大写显示，从而"
-"表明它们是商标。"
+"Cheese 可以操作绝大多数网络摄像头，但有些老的摄像头可能不支持。"
 
-#: C/cheese.xml:35(para)
+#: C/mode-wide.page:19(info/desc)
+#, fuzzy
 msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"文档按“原样”提供，不提供任何明示或暗示的保证，包括但不限于：文档或文档的修改"
-"版本没有适销性方面的缺陷、适合特定目的的适用性，以及没有侵权行为。您将自行承"
-"担本文档以及文档修改版本的质量、准确性以及性能方面的风险。如果任何文档或文档"
-"修改版本存在缺陷，您（而不是最初的编写者、作者或撰写人）将承担所有必需的服"
-"务、维修或更正的费用。此免责声明是本许可证的重要组成部分。如果不接受此免责声"
-"明，那么您就没有权利使用任何文档或文档的修改版本；并且"
+"Change the position of the photo stream so that the webcam video feed is "
+"larger."
+msgstr "改变照片集的位置，让摄像头视频输入更大。"
+
+#: C/mode-wide.page:23(page/title)
+msgid "Make the webcam video preview bigger"
+msgstr "放大摄像头视频预览"
 
-#: C/cheese.xml:55(para)
+#: C/mode-wide.page:25(page/p)
 msgid ""
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
+"The photo stream is where photos and videos appear after you have taken or "
+"recorded them. By default, it is a horizontal strip at the bottom of the "
+"Cheese window."
 msgstr ""
-"无论在任何情况以及在任何法律理论下，本文档或文档修改版本的作者、最初的编写"
-"者、任何撰写人或任何分发者，或者任意这些方的任何提供者都不对任何人由于使用本"
-"文档或文档修改版本引起或带来的任何直接的、间接的、特殊的、偶然的或继发的损失"
-"承担任何民事（包括疏忽）、合同或其它方面的责任，这些损失包括但不限于信誉损"
-"失、工作停止、计算机失败或故障，或任何以及所有其它损失或由此引发的或与之相关"
-"的损失，即使这些方已被告知存在出现此类损失的可能性时也是如此。"
+"照片集是在您拍照或录像后照片和视频出现的地方。默认情况下，照片集是一条水平"
+"带，位于茄子窗口的底部。"
 
-#: C/cheese.xml:28(para)
+#: C/mode-wide.page:29(page/p)
 msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-""
+"You can make the photo stream appear as a vertical bar. This is useful if "
+"you have a wide computer screen which is not very high; switching to a "
+"vertical layout means that there is more room to display the video feed from "
+"the webcam."
 msgstr ""
-"本文档以及文档的修改版本都是在遵循 GNU 自由文档许可证的条款下提供，这表示具有"
-"以下含义："
-
-#: C/cheese.xml:62(firstname)
-msgid "Joshua"
-msgstr "Joshua"
-
-#: C/cheese.xml:63(surname)
-msgid "Henderson"
-msgstr "Henderson"
-
-#: C/cheese.xml:64(email)
-msgid "joshhendo@gmail.com"
-msgstr "joshhendo@gmail.com"
-
-#: C/cheese.xml:67(firstname)
-msgid "Jaap"
-msgstr "Jaap"
-
-#: C/cheese.xml:68(surname)
-msgid "Haitsma"
-msgstr "Haitsma"
-
-#: C/cheese.xml:69(email)
-msgid "jaap@haitsma.org"
-msgstr "jaap@haitsma.org"
-
-#: C/cheese.xml:72(firstname)
-msgid "Felix"
-msgstr "Felix"
+"您也可以将照片集调整为垂直带。在屏幕高度不够的宽屏计算机上，这种视图很有用；"
+"切换到垂直布局则会有更多的空间来显示摄像头视频输入。"
 
-#: C/cheese.xml:73(surname)
-msgid "Kaser"
-msgstr "Kaser"
-
-#: C/cheese.xml:74(email)
-msgid "f.kaser@gmx.net"
-msgstr "f.kaser@gmx.net"
-
-#: C/cheese.xml:94(revnumber)
-msgid "0.1"
-msgstr "0.1"
-
-#: C/cheese.xml:95(date)
-msgid "2007-12-04"
-msgstr "2007-12-04"
-
-#: C/cheese.xml:97(para) C/cheese.xml:108(para) C/cheese.xml:122(para)
-#: C/cheese.xml:136(para)
-msgid "Jaap A. Haitsma jaap@haitsma.org"
-msgstr "Jaap A. Haitsma jaap@haitsma.org"
-
-#: C/cheese.xml:100(para) C/cheese.xml:114(para) C/cheese.xml:128(para)
-#: C/cheese.xml:145(para)
-msgid "Jaap A. Haitsma"
-msgstr "Jaap A. Haitsma"
-
-#: C/cheese.xml:105(revnumber)
-msgid "0.2"
-msgstr "0.2"
-
-#: C/cheese.xml:106(date)
-msgid "2008-01-12"
-msgstr "2008-01-12"
-
-#: C/cheese.xml:111(para) C/cheese.xml:125(para) C/cheese.xml:139(para)
-msgid "Joshua Henderson joshhendo@gmail.com"
-msgstr "Joshua Henderson joshhendo@gmail.com"
-
-#: C/cheese.xml:119(revnumber)
-msgid "0.3"
-msgstr "0.3"
-
-#: C/cheese.xml:120(date)
-msgid "2008-08-20"
-msgstr "2008-08-20"
-
-#: C/cheese.xml:133(revnumber)
-msgid "0.4"
-msgstr "0.4"
-
-#: C/cheese.xml:134(date)
-msgid "2009-07-15"
-msgstr "2009-07-15"
+#: C/mode-wide.page:34(page/p)
+msgid ""
+"To switch to a vertical layout, click Cheese Wide "
+"Mode. To switch back to a horizontal layout, uncheck the "
+"option."
+msgstr ""
+"要切换到垂直布局，点击茄子 宽屏模式。"
+"如果要切回到水平布局模式，取消选中该选项即可。"
 
-#: C/cheese.xml:142(para) C/cheese.xml:153(para)
-msgid "Felix Kaser f.kaser@gmx.net"
-msgstr "Felix Kaser f.kaser@gmx.net"
+#: C/mode-wide.page:39(note/p)
+msgid ""
+"Another way to increase the size of the webcam preview is to make "
+"Cheese fullscreen. To do this, click CheeseFullscreen or press F11. To quit the "
+"fullscreen mode, press F11."
+msgstr ""
+"增大摄像头预览尺寸的另一种方法是：让茄子全屏。要打开全屏，请点击"
+"茄子全屏或按下F11。要退出全"
+"屏模式，按下F11。"
 
-#: C/cheese.xml:150(revnumber)
-msgid "0.5"
-msgstr "0.5"
+#: C/photo-delete.page:19(info/desc)
+msgid "Remove photos and videos that you no longer want to keep."
+msgstr "移除不想再保留的照片和视频。"
 
-#: C/cheese.xml:151(date)
-msgid "2009-09-14"
-msgstr "2009-09-14"
+#: C/photo-delete.page:22(page/title)
+msgid "Delete a photo or video"
+msgstr "删除照片或视频"
 
-#: C/cheese.xml:156(para)
-msgid "Felix Kaser"
-msgstr "Felix Kaser"
+#: C/photo-delete.page:24(page/p)
+msgid "If you no longer want a photo or video, you can permanently delete it:"
+msgstr "如果您不想再保存某些照片或视频，可以永久删除它："
 
-#: C/cheese.xml:163(title)
-msgid "Feedback"
-msgstr "反馈"
+#: C/photo-delete.page:28(item/p)
+msgid ""
+"Find the photo or video that you want to delete in the photo stream at the "
+"bottom of the Cheese window."
+msgstr "在茄子窗口底部的照片集里面找到您想要删除的照片或视频。"
 
-#: C/cheese.xml:164(para)
+#: C/photo-delete.page:32(item/p)
 msgid ""
-"To report a bug or make a suggestion regarding the Cheese application or "
-"this manual, follow the directions in the Cheese project page."
+"Right-click it and select Delete. Alternatively, click it once to "
+"select it and press the Delete key."
 msgstr ""
-"要对 Cheese 应用程序或本手册提出建议或报告 bug，请依照Cheese"
-"项目页面中的指导行事。"
+"右键点击，选择删除。或者，单击想要删除的照片或视频，选中后按下 "
+"Delete 键。"
 
-#: C/cheese.xml:0(application)
-msgid "Cheese"
-msgstr "Cheese"
+#: C/photo-delete.page:36(item/p)
+msgid ""
+"You will be asked if you want to permanently delete it. Confirm by clicking "
+"Delete; you will not be able to recover the photo."
+msgstr ""
+"此时，程序将询问您是否真的要永久删除它，单击删除确认。已删除的照片"
+"将无法恢复。"
 
-#: C/cheese.xml:178(primary) C/cheese.xml:191(tertiary)
-msgid "cheese"
-msgstr "cheese"
+#: C/photo-delete.page:41(page/p)
+msgid ""
+"If you are not sure whether you want to permanently delete the photo or "
+"video, you can right click it and select Move to Trash instead. "
+"This will move it to the computer's Trash folder."
+msgstr ""
+"如果您不确定是否要永久删除这些照片或视频，您可以右键点击它，选择移入回收"
+"站。这会将它移动到计算机的回收站文件夹。"
 
-#: C/cheese.xml:184(title)
-msgid "Introduction"
-msgstr "简介"
+#: C/photo-delete.page:45(note/p)
+msgid ""
+"Cheese does not have its own Trash folder and you cannot access "
+"your computer's Trash folder from within Cheese."
+msgstr ""
+"茄子没有自己单独的回收站文件夹，您无法在茄子软件中来访"
+"问计算机上的回收站文件夹。"
 
-#: C/cheese.xml:190(secondary)
-msgid "Manual"
-msgstr "手册"
-
-#: C/cheese.xml:194(para)
-msgid ""
-"Cheese uses your webcam to take photos and videos, applies fancy special "
-"effects and lets you share the fun with others."
-msgstr ""
-"Cheese 使用您的摄像头获取照片和视频，应用精美的特效并让您和他人分享乐趣。"
-
-#: C/cheese.xml:202(title)
-msgid "Usage"
-msgstr "使用"
-
-#: C/cheese.xml:203(para)
-msgid ""
-"The main screen of Cheese supports two different layouts at the moment. The "
-"default looks like the screenshot below, it has the preview image centered "
-"and the thumbnail slideshow below."
-msgstr ""
-"Cheese 主屏现在支持两种不同的布局。默认布局看起来如下面的截图，预览图在中间而"
-"缩略图位于其下方。"
-
-#: C/cheese.xml:210(title)
-msgid "Cheese screenshot"
-msgstr "Cheese 截图"
-
-#: C/cheese.xml:220(para)
-msgid ""
-"Especially for Cheese-users with small displays, like the ones in netbooks, "
-"we have designed another view. It is more horizontally aligned, in order to "
-"fit better on small widescreen displays. The wide-view is shown in the "
-"screenshot below."
-msgstr ""
-"我们特别为使用诸如上网本的小屏幕的 Cheese 用户设计了另一种视图模式。这种视图"
-"更倾向水平排列，以便更加适合较小的宽屏。宽视图模式以截图展示如下。"
-
-#: C/cheese.xml:227(title)
-msgid "Cheese wide screenshot"
-msgstr "Cheese 宽布局模式截图"
-
-#: C/cheese.xml:237(para)
-msgid ""
-"Cheese uses the photo mode by defaults, but you can change this to use the "
-"video or burst mode if desired."
-msgstr ""
-"Cheese 默认使用拍照模式，但如果愿意您可以改变设置以使用视频模式或连拍模式。"
-
-#: C/cheese.xml:243(title)
-msgid "Effects"
-msgstr "特效"
-
-#: C/cheese.xml:249(title)
-msgid "Cheese effects screenshot"
-msgstr "Cheese 特效截图"
-
-#: C/cheese.xml:244(para)
-msgid ""
-"To apply effects to the input of your webcam, click the button labelled "
-"Effects. When you then go to the effects window, you "
-"will see a window similar to the image below. "
-msgstr ""
-"单击标有特效标签的按钮将会把相应特效应用到摄像头输入。"
-"当您进入特效窗口时，会看到一个类似以下图片的窗口。"
-
-#: C/cheese.xml:261(para)
-msgid ""
-"You can apply some really cool effects to your photos too! Just choose from "
-"the several different effects available and click its corresponding button "
-"to apply it to your photo. Selecting multiple effects will apply all the "
-"effects to your image. For example, if you select Hulk and Vertical Flip, the input from the "
-"webcam will be altered to have a green shade and be upside down. To disable "
-"all effects, just click on the No Effect button."
-msgstr ""
-"您也可以为您的照片应用多种很酷的特准。只需从可用的特效中选择并按下相应的按钮"
-"即可将其应用到照片上。选中多个特效将会将其全部应用于您的图片上。例如，如果您"
-"选择绿巨人和垂直翻转，摄像头输"
-"入将会增加绿色阴影和上下翻转的特效。如果要停用所有特效，只需按一下 "
-"无特效 "
-
-#: C/cheese.xml:272(para)
-msgid ""
-"To return to the preview of your webcam, just push the button labelled "
-"Effects again. This will toggle the Effects menu and "
-"bring you back to the normal view."
-msgstr ""
-"要回到摄像头预览窗口，请按下标有特效标签的按钮。这将切"
-"换特效菜单并将您带回普通普通视图。"
-
-#: C/cheese.xml:280(title)
-msgid "Photo Mode"
-msgstr "照片模式"
-
-#: C/cheese.xml:281(para)
-msgid ""
-"Photo mode is the default mode for Cheese. When not in photo mode, click the "
-"button that shows the icon of a single photo or select it from the menu: "
-"CheesePhoto to change to photo mode. Photo mode will take a single photo "
-"every time the button labelled Take a photo or the "
-"Spacebar key is pressed, and will save to disk."
-msgstr ""
-"照片模式是 Cheese 默认的模式。要切换到此模式，请点击标有照片标签的按钮，或者从菜单中选择： Cheese照片 切换为照片模式。在此模式"
-"下，每一次按下拍照或者空格按钮时将会"
-"拍摄一张照片并将其保存到磁盘。"
-
-#: C/cheese.xml:293(title)
-msgid "Video Mode"
-msgstr "视频模式"
-
-#: C/cheese.xml:294(para)
-msgid ""
-"Video mode is a mode that allows you to take short videos using the webcam. "
-"When not in video mode, click the button that shows the icon of a film roll "
-"or select it from the menu: CheeseVideo to change to video "
-"mode. Video mode will start recording a video every time the button labelled "
-"Start Recording or the Spacebar is "
-"pressed. The video will stop recording and save to disk when the button "
-"labelled Stop Recording or the Spacebar is pressed."
-msgstr ""
-"视频模式是一个使您可以使用网络摄像头来拍摄短片的模式。要切换到些模式，请点击"
-"显示电影胶片图标的按钮或从菜单中选择： Cheese视频 切换为视频模式。在此模式"
-"下，每次按下标有开始录制标签的按钮或者空格键时将开始录制一段视频。当按下标有停止录制标签"
-"的按钮或者空格空格键时将停止录制并将视频保存到磁盘。"
-
-#: C/cheese.xml:306(para)
-msgid ""
-"The video mode does not look much different from the photo mode, except that "
-"the button labelled Take a photo will say "
-"Start Recording or Stop Recording, and the button with the film roll icon is pushed in, whereas the "
-"other mode buttons (photo and burst) are not."
-msgstr ""
-"视频模式看上去并未跟照片模式有多少不同，只是标有拍照标"
-"签的按钮将被标记为开始录制或者停止录制，并且在录制时显示电影胶片的按钮是处于按下状态的，其他模式则没有此"
-"状态。"
-
-#: C/cheese.xml:316(title)
-msgid "Burst Mode"
-msgstr "连拍模式"
-
-#: C/cheese.xml:317(para)
-msgid ""
-"In burst mode you can take more pictures in a row. It works exactly like the "
-"photo mode, except that it takes a series of pictures. When you are not in "
-"burst mode, click the button that shows the icon of several pictures in a "
-"row or select it from the menu: CheeseBurst to change to burst "
-"mode. Burst mode will start to take a series of pictures with an interval of "
-"some seconds in between photos when the button labelled Take "
-"Multiple Photos or the Spacebar key is pressed. "
-"The delay and amount of pictures to take can be set in the preferences "
-"dialog. For more information please see ."
-msgstr ""
-"在连拍模式您可以连续拍摄多张照片。它跟照片模式几乎一样，不同的是此模式拍摄一"
-"连串的照片。要切换到连拍模式，请单击显示一连串图片的图标的按钮，或者从菜单中"
-"选择：Cheese连拍切换到连拍模式。在此模式下，当您按下标有拍摄多疑照片的按钮或者空格键时，Cheese 会开始以一定的时间间隔"
-"拍摄一连串的照片。照片延迟时间和照片的数量可以在首先项对话框中设置。更多信息"
-"请参考。"
-
-#: C/cheese.xml:331(para)
-msgid ""
-"All modes can be used in fullscreen. To do this, click the "
-"CheeseFullscreen menu to enter fullscreen mode, or press the F11 "
-"key. To exit fullscreen mode, press the Esc or the "
-"F11 keys."
-msgstr ""
-"所有模式均可在全屏状态下使用，只需要点击Cheese全屏菜单或按 F11 键进入全屏即可。 要退出全屏模式，请按 Esc 或 "
-"F11。\" "
-
-#: C/cheese.xml:340(title)
-msgid "Cheese fullscreen screenshot"
-msgstr "Cheese 全屏模式截图"
-
-#: C/cheese.xml:354(title)
-msgid "Working with photos and videos"
-msgstr "运行照片和视频"
-
-#: C/cheese.xml:356(title)
-msgid "Taking a photo"
-msgstr "拍照"
-
-#: C/cheese.xml:357(para)
-msgid "To take a photo with Cheese, be sure to be in the “Photo” mode."
-msgstr "要使用 Cheese 拍照，请确保处于“照片”模式。"
-
-#: C/cheese.xml:361(para)
-msgid ""
-"It's easy to take photos with special effects. Just click the button "
-"labelled Effects, and click on the effects desired as "
-"described in . You should now have the "
-"effects that you chose applied to the webcam input. Press the effects button "
-"again to get back to the normal view."
-msgstr ""
-"您可以方便地为照片添加特效。单击标有 特效 的按钮，然后"
-"根据  中的描述选择理想的效果。现在您选择中效"
-"果应该已经应用在了摄像头的输出。按 返回 按钮回到普通视"
-"图。"
-
-#: C/cheese.xml:369(para)
-msgid ""
-"To take a photo, press the button labelled Take a photo or press the spacebar key. Alternatively, you "
-"can also use the webcam capture button, if your webcam has one. You will "
-"then see Cheese count down from 3 or instantly "
-"take the photo, depending on your settings. When the photo is taken, your "
-"entire screen will flash white, and the photo that was just taken will "
-"appear in the photo stream at the bottom of the program's window. To abort "
-"the countdown you can use the Esc key."
-msgstr ""
-"要拍摄照片，请单击标有拍照标签的按钮或空格键。或者，您也可以使用摄像头上的捕获按钮(如果摄像头上有的话)。您会看"
-"到 Cheese 倒计时 3 秒或立即拍照，这取决于您的设"
-"置。拍照时，您的整个屏幕会有白色的闪烁，接着照片会出现在程序窗口底部的照片集"
-"里。按 Esc 键停止倒计时。"
+#: C/photo-save.page:19(info/desc)
+msgid "Save a photo or video in a different folder."
+msgstr "将照片或视频保存到另一文件夹。"
 
-#: C/cheese.xml:382(title)
-msgid "Recording a video"
-msgstr "录制视频"
+#: C/photo-save.page:22(page/title)
+msgid "Save a photo or video"
+msgstr "保存照片或视频"
 
-#: C/cheese.xml:383(para)
+#: C/photo-save.page:24(page/p)
 msgid ""
-"To record a video in Cheese, make sure that the Video "
-"button has been pressed."
+"By default, Cheese saves the photos and videos in the PicturesWebcam and VideosWebcam folders in your user folder."
 msgstr ""
-"要在 Cheese 中拍摄视频，请确保 视频 按钮被按下。"
+"默认情况下，茄子将照片和视频文件保存到您的主目录下的图片和"
+"视频文件夹。"
 
-#: C/cheese.xml:388(para)
+#: C/photo-save.page:29(page/p)
 msgid ""
-"To start recording a video, press the button labelled Start "
-"Recording or press the Spacebar key. "
-"Alternatively, you can also use the webcam capture button, if your webcam "
-"has one. To stop recording just press the same button, now labelled "
-"Stop Recording, and the recording will stop and the "
-"video saved."
+"To save an image to a different location, right-click the image in the photo "
+"stream and click Save As. Then, choose where you want to save the "
+"image."
 msgstr ""
-"要开始录制视频，请按下标有开始录制标签的按钮或"
-"空格键。或者，您也可以使用抱着上的捕获按钮(如果摄像头上有的话)。要停"
-"止录制视频，请按下相同的按钮，该按钮此时被标记为停止录制，录制将会停止并将视频存盘。"
+"要将照片保存到另一位置，请在照片集里右键点击它，选择另存为。然后，"
+"选择您想要保存该照片的位置。"
 
-#: C/cheese.xml:397(para)
+#: C/photo-save.page:33(page/p)
 msgid ""
-"If your video appears to be jerky or has a low frame rate (only updating the "
-"picture every few seconds), it does not mean that the recording has a "
-"similar frame rate. In many cases, the recorded file will have a better "
-"frame rate."
+"Alternatively, open the folder where you want to keep the image using the "
+"file manager, then drag it from the photo stream into that folder."
 msgstr ""
-"如果您的视频看起来不稳定或帧速率过低(几秒种才更新一次图像)，这并不意味着录制"
-"时也会有相似的帧速率。在许多情况下，所录制的文件将会有更高的帧速率。"
-
-#: C/cheese.xml:406(title)
-msgid "Taking a series of pictures in burst mode"
-msgstr "以连拍模式拍摄多张照片"
+"或者，通过文件管理器打开想要保存照片的文件夹，然后将照片从照片集拖入该文件"
+"夹。"
 
-#: C/cheese.xml:407(para)
+#: C/photo-save.page:36(page/p)
 msgid ""
-"To take more than one picture over some time you can use the burst mode. "
-"Burst mode can be set up in the preferences dialog where you can also set "
-"the amount of pictures you want to take and the delay in seconds between "
-"them. You can find more information about that in ."
+"A new copy of the image will be saved in the new location. The old version "
+"will remain in the PicturesWebcam or "
+"VideosWebcam folder."
 msgstr ""
-"要在一张时间内拍摄多于一张照片请使用连拍模式。您可以在首选项对话框中设置连拍"
-"模式拍摄的照片数量和照片之间的延迟秒数。您要以在中找到更多信息。"
+"照片的一份新副本将保存到新位置。原来那份将留在图片Webcam或视频Webcam文件夹中。"
 
-#: C/cheese.xml:414(para)
-msgid ""
-"To start the burst mode, press the button labelled Take Multiple "
-"Photos or press the Spacebar key. "
-"Alternatively, you can also use the webcam capture button, if your webcam "
-"has one. To stop the burst capture you can use the Esc key."
-msgstr ""
-"要开始连拍，请按下标有 拍摄多张照片的按钮或者按"
-"空格键。或者，您也可以按摄像头上的捕获按钮(如果有的话)。要停"
-"止连拍捕获请按Esc键。"
+#: C/photo-take.page:24(info/desc)
+msgid "Use your webcam to take photos instead of videos."
+msgstr "用您的摄像头拍照而不是录像。"
 
-#: C/cheese.xml:424(title)
-msgid "Setting up Cheese"
-msgstr "设置 Cheese"
+#: C/photo-take.page:27(page/title)
+msgid "Take photos with the webcam"
+msgstr "使用摄像头拍照"
 
-#: C/cheese.xml:427(title)
-msgid "The preferences dialog"
-msgstr "首选项对话框"
+#: C/photo-take.page:29(page/p)
+msgid ""
+"Webcams can be used to take still photos, as well as videos. To take a photo:"
+msgstr "除了录像之外，摄像头也可以用来拍照。要拍照："
 
-#: C/cheese.xml:428(para)
+#: C/photo-take.page:34(item/p)
 msgid ""
-"The preferences dialog allows you to set up some webcam specific parameters "
-"and parameters specific to the burst mode. If you have more than one webcam "
-"or video device attached to your system, the preferences dialog allows you "
-"to choose which one you would like to use for Cheese and what resolution the "
-"image should have. Use the sliders to play around with the brightness, "
-"contrast, saturation and hue values to find the best for your webcam."
+"Make sure that you're in Photo mode. If you are, the button in "
+"the main window will say Take a Photo."
 msgstr ""
-"首选项对话框允许您设置一些摄像头或连拍模式特有的参数。如果您的系统连有不止一"
-"个摄像头或视频设备，首选项对话框允许您选择您要为 Cheese 使用哪一个以及图片的"
-"分辨率。使用滑动条为您的摄像头设置最佳的亮度、对比度、饱和度和色调的值。"
-
-#: C/cheese.xml:437(title)
-msgid "Cheese preferences screenshot"
-msgstr "Cheese 首选项截图"
+"确保茄子运行在拍照模式。如果是，主窗口的按钮会显示拍照。"
 
-#: C/cheese.xml:447(para)
+#: C/photo-take.page:36(item/p)
 msgid ""
-"The parameters for the burst mode can be set in the preferences dialog as "
-"well. You only have to adjust the values for the number of photos you wish "
-"to take and the delay in seconds between each picture taken."
+"To switch to Photo mode, click the small photo button in the "
+"bottom left of the window or click Cheese Photo."
 msgstr ""
-"连拍模式的参数也可在首选项对话框中设置。您只需设置您想拍摄的照片数目和照片之"
-"间的延迟秒数。"
+"要切换到拍照模式，点击窗口左下方的小照片按钮或点击茄"
+"子照片。"
 
-#: C/cheese.xml:455(title)
-msgid "GConf settings"
-msgstr "GConf 设置"
+#: C/photo-take.page:41(item/p)
+msgid "Click Take a Photo or press the spacebar."
+msgstr "点击拍照或按下空格键。"
 
-#: C/cheese.xml:456(para)
+#: C/photo-take.page:44(item/p)
 msgid ""
-"It's possible to define where Cheese stores the captured media (photos and "
-"videos). These settings are stored in GConf. You can change the settings "
-"with the gconf-editor, application. There you have to "
-"select /apps/cheese in the tree on the left. Then you can set the "
-"video_path and photo_path to the "
-"location you prefer. There you can also set other parameters for Cheese, but "
-"you should use the preferences dialog for a controlled access."
+"There will be a short countdown, followed by a flash, and then the photo "
+"will appear in the photo stream at the bottom of the window."
 msgstr ""
-"可以定义 Cheese 存放捕获的媒体文件(照片和录像)的位置。这些设置储存在 GConf。"
-"您可以用 gconf-editor 实用程序更改这些设置。设置时您需要在"
-"左边的树中选择 /apps/cheese，然后您就可以将 video_path "
-"和 photo_path 设成喜欢的地方。在此您也可以设置 Cheese 的"
-"其他参数，但您应该在首选项对话框中"
+"将会有短暂的倒计时，灯光一闪，“咔嚓”，照片就出现在窗口底部的照片集里面了。"
 
-#: C/cheese.xml:465(para)
+#: C/photo-take.page:49(page/p)
 msgid ""
-"Attention: Be careful while using GConf to change your settings! If you are "
-"not completely sure about what you are doing, you should ask someone who "
-"knows!"
+"The photos in the photo stream are automatically saved in the "
+"PicturesWebcam folder in your user "
+"folder. They are saved in the JPEG (.jpg) format."
 msgstr ""
-"注意：务必小心使用 GConf 改变您的设置！如果您不完全确定您在做什么，您应该向知"
-"道的人请教。"
+"照片集里面的照片将自动保存到主目录下的图片Webcam文件夹中。它们以 JPEG(.jpg) 格式保存。"
 
-#: C/cheese.xml:472(title)
-msgid "Sharing Photos and Videos"
-msgstr "分享照片和视频"
-
-#: C/cheese.xml:475(title)
-msgid "Viewing a photo or video"
-msgstr "查看照片或视频"
-
-#: C/cheese.xml:476(para)
+#: C/photo-take.page:53(page/p)
 msgid ""
-"To view a video or photo that has been taken, locate it in the photo stream "
-"and double click it. Alternatively, you can right click on it and select "
-"Open. This will then open the file in the default "
-"application for that file type."
+"To cancel taking a photo after you have clicked Take a Photo, "
+"press Esc before the countdown finishes."
 msgstr ""
-"要查看已拍摄的照片或视频，找到相应的照片集并双击。或者，您可以右键单击并选择"
-"打开。这将使用该文件类型的默认的应用程序来打开它。"
-
-#: C/cheese.xml:484(title)
-msgid "Saving photos and videos to an alternate location"
-msgstr "保存照片和视频到其他位置"
+"如果您在点击拍照后想取消拍照，请在倒计时结束前按下 Esc。"
 
-#: C/cheese.xml:485(para)
+#: C/photo-take.page:57(note/p)
 msgid ""
-"To save a photo to an alternate place on your system where you can easily "
-"find them, find the photo or video that you wish to save in the photo "
-"stream, right click on it and select Save As from "
-"the pop-up menu. This will bring up a standard Save File dialog that will allow you to save it to a new location as well as "
-"rename it if you so wish to do."
+"To take multiple photos in rapid succession, use Burst mode."
 msgstr ""
-"要将照片保存硬盘中的其他位置以使您容易找到，请先找到您想保存到照片集中的照片"
-"或视频，在其上单击右键并在弹出菜单中选择另存为。这"
-"将弹出一个标准的 保存文件对话框，它允许您将照片保存到其"
-"他地方或依您所愿对其进行重命名。"
+"如果要快速连拍多幅照片，请使用连拍模式。"
 
-#: C/cheese.xml:495(title)
-msgid "Deleting a photo"
-msgstr "删除照片"
+#: C/photo-view.page:19(info/desc)
+msgid "Photos and videos will automatically appear in the photo stream."
+msgstr "照片和视频会自动出现在照片集中。"
 
-#: C/cheese.xml:496(para)
+#: C/photo-view.page:23(page/title)
+msgid "View a photo or video that you took"
+msgstr "查看您拍摄的照片或视频"
+
+#: C/photo-view.page:25(page/p)
 msgid ""
-"To delete a photo from the photo stream, locate the photo you wish to delete "
-"in the photo stream, left click on it once and press the delete button on your keyboard. Alternatively, you can right click on it "
-"and select Delete from the pop-up menu."
-msgstr ""
-"要从照片集中删除照片，请先在照片集中找到您想要删除的照片，在其上单击左键然后"
-"按键盘上的 delete 按钮。另外，您也可以在照片上点击右键并从弹"
-"出菜单中选择 删除 。"
+"After you take a photo or record a video, it will appear in the photo stream "
+"at the bottom of the window."
+msgstr "您拍完照或录完视频后，照片或视频将出现在窗口底部的照片集里面。"
 
-#: C/cheese.xml:503(para)
+#: C/photo-view.page:28(page/p)
 msgid ""
-"You will be asked if you wish to delete it from the photo stream. To "
-"confirm, press the button labelled Move to Trash."
+"If you want to see a bigger version of a photo, or to play a video, double-"
+"click it. This will open it in the default photo viewer or video player."
 msgstr ""
-"将会有对话框询问您是否想从照片集中删除此照片。按下标有移动至回收站"
-"标签的按钮进行确认。"
+"如果您要看到照片的更大尺寸，或要播放录像，双击文件即可。该操作将通过默认图片"
+"浏览器或视频播放器打开它们。"
 
-#: C/cheese.xml:509(para)
+#: C/photo-view.page:31(page/p)
 msgid ""
-"This will move the image to the \"trash\", as well as remove from your photo "
-"stream. This will not remove the photo from your computer. To remove it from "
-"your system, you will need to empty your trash."
+"All of the photos and videos in the photo stream are saved in the "
+"PicturesWebcam or "
+"VideosWebcam folders in your user "
+"folder."
 msgstr ""
-"这将会将图片移动到“回收站，并将其从照片集中删除。这不会将照片从您的计算机中删"
-"除。要将其完全从系统中删除，您需要清空回收站。"
+"照片集里所有的照片和视频都保存在主目录的图片Webcam 或 视频Webcam文件夹中。"
+
+#: C/pref-burst-mode.page:19(info/desc)
+msgid ""
+"Burst mode takes several photos rapidly. Change your pose in "
+"between each shot!"
+msgstr "连拍模式会快速拍下多张照片。记得在拍照时多摆几个 Pose 呀！"
 
-#: C/cheese.xml:518(title)
-msgid "Send a photo by e-mail"
-msgstr "用 e-mail 发送照片"
+#: C/pref-burst-mode.page:23(page/title)
+msgid "Take multiple photos in quick succession"
+msgstr "快速拍下多张照片"
 
-#: C/cheese.xml:519(para)
+#: C/pref-burst-mode.page:25(page/p)
 msgid ""
-"Photos can be directly emailed from Cheese. You will need to have the "
-"default mail client set up with an email account. To email a photo, locate "
-"the photo in the photo stream, right click on it and select "
-"Send by Mail."
+"You can use Burst mode to automatically take several photos in "
+"one go, with a short pause between shots. It is particularly fun if you "
+"change your pose in between photos! To use Burst mode:"
 msgstr ""
-"照片可以 Cheese 中直接通过电子邮件发送。您需要在默认的邮件客户端设置一个电子"
-"邮件帐户。要发送照片，请先在照片集中找到您要发送的照片，在其上单击右键并选择"
-"通过邮件发送。"
+"您可以使用 连拍模式 一次拍摄多张照片，拍摄时中间会有短暂停顿。如果"
+"拍照时不断改变您的姿势，将会很有趣！要启用连拍模式："
 
-#: C/cheese.xml:526(para)
+#: C/pref-burst-mode.page:31(item/p)
 msgid ""
-"This will open the default mail client (for example, Evolution) and a new "
-"email message will be created with the photo you selected as an attachment."
+"Click Burst, the Take a Photo button will now say "
+"Take Multiple Photos."
 msgstr ""
-"这将打开默认邮件客户端(例如， Evolution)和一个以您选择的照片为附件的新的电子"
-"邮件讯息。"
-
-#: C/cheese.xml:533(title)
-msgid "Set as Account Photo"
-msgstr "设置为帐户图片"
+"点击连拍，此时拍照按钮将会显示：拍摄多张照片。"
 
-#: C/cheese.xml:534(para)
+#: C/pref-burst-mode.page:33(item/p)
 msgid ""
-"To set a photo as your account photo (which can be viewed from the "
-"SystemPreferencesAbout Me menu, and the "
-"login window with a list of user names with photos), locate the photo that "
-"you wish to use in Cheese, right click on it and select Set as "
-"Account Photo."
-msgstr ""
-"要将照片设为您的帐户照片(可以在系统首选项关于我菜单中和列有用户名和照片的登录窗口中看到)，先找到此照片，在其上单"
-"击右键并选择设为账户照片。"
+"Alternatively, click CheeseBurst."
+msgstr "或者，点击茄子连拍。"
 
-#: C/cheese.xml:544(title)
-msgid "Export a photo to F-Spot"
-msgstr "将照片导出到 F-Spot"
+#: C/pref-burst-mode.page:36(item/p)
+msgid "Click Take Multiple Photos or press the spacebar."
+msgstr "点击拍摄多张照片 或按下空格键。"
 
-#: C/cheese.xml:545(para)
+#: C/pref-burst-mode.page:38(item/p)
 msgid ""
-"To export a photo to F-Spot, locate the photo in your photo stream, right "
-"click on it and select Export to F-Spot. You will "
-"then be prompted by F-Spot if you wish to import the photos that are being "
-"sent to it."
-msgstr ""
-"要把照片导出到 F-Spot，首先找到此照片，在其上单击右键，选择导出"
-"到 F-Spot。之后 F-Spot 会提示您是否想导入您正在发送的照片。"
+"By default, four photos will be taken, with a three second delay and a "
+"countdown between photos."
+msgstr "默认情况下会连拍 4 张照片，照片之间有三秒钟延迟和倒计时。"
 
-#: C/cheese.xml:552(para)
+#: C/pref-burst-mode.page:43(page/p)
 msgid ""
-"Depending on the version of Cheese that you are currently using, F-Spot may "
-"prompt you to import the entire photo stream."
-msgstr "F-Spot 会提示您导入所有照片。但这取决于您当前使用的 Cheese 版本。"
+"Press Esc if you want to stop Cheese from taking "
+"photos at any point."
+msgstr "任何时候您都可以按下Esc让Cheese停止拍照。"
 
-#: C/cheese.xml:559(title)
-msgid "Cheese sharing screenshot"
-msgstr "Cheese 分享照片的截图"
+#: C/pref-burst-mode.page:47(section/title)
+msgid "Change how many photos are taken and the delay between them"
+msgstr "改变连拍照片的数量和延迟时间"
 
-#: C/cheese.xml:580(title)
-msgid "Frequently Asked Questions"
-msgstr "常见问题"
+#: C/pref-burst-mode.page:48(section/p)
+msgid ""
+"You can change how many photos will be taken in each burst and the length of "
+"the delay between the photos:"
+msgstr "您可以修改在每次连拍时拍摄照片的数量和照片之间的延迟时间："
 
-#: C/cheese.xml:586(title)
-msgid "The video is sluggish/has a slow response. What can I do?"
-msgstr "视频反应很慢/响应迟钝。我该怎么办？"
+#: C/pref-burst-mode.page:52(item/p) C/pref-image-properties.page:30(item/p)
+#: C/pref-photo-resolution.page:36(item/p)
+msgid "Click EditPreferences."
+msgstr "单击编辑首选项。"
 
-#: C/cheese.xml:587(para)
+#: C/pref-burst-mode.page:55(item/p)
 msgid ""
-"You may have set \"ximagesink\" (X Window "
-"System (No Xv)) as video-output. This means that your CPU is "
-"doing all the work. Change it to \"xvimagesink"
-"\" (X Window System (X11/XShm/Xv)) in order to let your "
-"graphics card do the work."
-msgstr ""
-"您可能把“ximagesink”(X Window System (No Xv)) 设为了视频输出。这意味着由您的 CPU 来承担所有的工作。将其修改"
-"为“xvimagesink”(X Window System (X11/XShm/Xv)) 以让您的显卡分担部分工作。"
+"Change the options under Burst mode and click Close."
+msgstr "改变连拍模式下的选项，单击关闭。"
 
-#: C/cheese.xml:593(para)
+#: C/pref-burst-mode.page:59(note/p)
 msgid ""
-"To change this setting, run the gstreamer-properties "
-"command, click the Video tab and change the appropriate "
-"setting."
+"The delay is between the last photo taken and the start of the countdown for "
+"the next photo, not between two photos."
 msgstr ""
-"要改变此设置，运行 gstreamer-properties 命令，单击"
-"视频选项卡并选择合适的设置。"
+"延迟是上张照片拍摄结束和下张照片倒计时开始之间的时间，不是两张照片拍摄间的时"
+"间。"
 
-#: C/cheese.xml:601(title)
-msgid ""
-"I have a Mac with iSight and a ATI graphics card, and the colors are weird."
-msgstr "我的是苹果电脑，装有 iSight 软件并配有 ATI 显卡，图像颜色很奇怪。"
+#: C/pref-countdown.page:19(info/desc)
+msgid "Remove the countdown so that photos are taken instantly."
+msgstr "移除倒计时可以立即拍摄照片。"
 
-#: C/cheese.xml:602(para)
-msgid ""
-"This is a problem with the ATI graphics card, though there is a work around. "
-"Change the video-output to custom and insert the following: "
-"\"ffmpegcolorspace ! video/x-raw-yuv,format=(fourcc)YV12 ! "
-"ffmpegcolorspace ! xvimagesink\"."
-msgstr ""
-"这是 ATI 显卡的一个问题，有一种变通的解决办法。将视频输出设为自定义，并插入以"
-"下字符：“ffmpegcolorspace ! video/x-raw-yuv,format=(fourcc)YV12 ! "
-"ffmpegcolorspace ! xvimagesink”。"
+#: C/pref-countdown.page:22(page/title)
+msgid "Disable the Countdown before photos are taken"
+msgstr "禁用拍摄照片前的倒计时"
 
-#: C/cheese.xml:608(para)
+#: C/pref-countdown.page:24(page/p)
 msgid ""
-"To change this setting, run the gstreamer-properties "
-"command, click the Video tab and select custom from the "
-"drop down menu."
+"By default, Cheese counts down from three before taking a photo. "
+"You can disable this feature by clicking Edit "
+"Preferences and unchecking Countdown."
 msgstr ""
-"要改变此设置，运行 gstreamer-properties 命令，单击"
-"视频选项卡，从下拉菜单中选择自定义。"
+"默认情况下，茄子在拍照前从 3 开始倒计时。您可以通过点击"
+"编辑 首选项，取消选中倒计时，就可以禁用该功能。"
 
-#: C/cheese.xml:616(title)
+#: C/pref-flash.page:18(info/desc)
+msgid "Stop the screen from flashing white when taking a photo."
+msgstr "拍照时禁用屏幕闪光。"
+
+#: C/pref-flash.page:21(page/title)
+msgid "Disable the flash"
+msgstr "禁用闪光灯"
+
+#: C/pref-flash.page:23(page/p)
 msgid ""
-"My webcam works with gstreamer, but does not work with Cheese. What's wrong?"
-msgstr ""
-"我的摄像头在 gstreamer 中工作良好，但在 Cheese 中"
-"却不行。这是怎么回事？"
+"When you take a photo with Cheese, the computer screen briefly turns white. "
+"This provides additional light."
+msgstr "当您使用茄子拍照时，电脑屏幕会短暂变白。这会提供额外的亮光。"
 
-#: C/cheese.xml:617(para)
+#: C/pref-flash.page:26(page/p)
 msgid ""
-"Using the gstreamer-properties mentioned in the above "
-"question, try changing from xvimagesink to "
-"ximagesink or vice-versa. If this still does not work, "
-"run cheese --verbose on the command line and copy the "
-"logging into a bug report in our  bug tracker."
+"To disable this feature, click EditPreferences and uncheck Fire Flash."
 msgstr ""
-"使用上一问题中提到的 gstreamer-properties 命令，尝试将 "
-"xvimagesink 改为 ximagesink 或者反"
-"过来。如果仍然不行，请在命令行运行 cheese --verbose，将日"
-"志复制到 bug tracker中的错误报告。"
+"要禁用该功能，请点击编辑首选项，"
+"取消选中闪光。"
+
+#: C/pref-fullscreen.page:13(info/desc)
+msgid "Enable and disable fullscreen mode"
+msgstr "启用和禁用全屏模式"
+
+#: C/pref-fullscreen.page:16(page/title)
+msgid "Fullscreen"
+msgstr "全屏"
+
+#: C/pref-fullscreen.page:18(page/p)
+msgid "To enable the fullscreen mode:"
+msgstr "要启用全屏模式："
 
-#: C/cheese.xml:628(title)
+#: C/pref-fullscreen.page:21(item/p)
+msgid "Select CheeseFullscreen"
+msgstr "或者，点击茄子全屏"
+
+#: C/pref-fullscreen.page:24(page/p)
+msgid "To disable the fullscreen mode:"
+msgstr "要禁用全屏模式："
+
+#: C/pref-fullscreen.page:27(item/p)
+msgid "Select Leave Fullscreen"
+msgstr "选择 离开全屏"
+
+#: C/pref-fullscreen.page:31(note/p)
 msgid ""
-"My webcam works with other programs such as Ekiga, Camorama, but not with "
-"Cheese. What's wrong?"
-msgstr ""
-"我的摄像头在 Ekiga、Camorama 中工作良好，但在 Cheese 中却不行。这是怎么回事？"
+"You can also enable and disable fullscreen mode by pressing F11"
+msgstr "您也可以通过按 F11 启用和禁用全屏模式"
 
-#: C/cheese.xml:629(para)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/pref-image-properties.page:45(media)
+msgctxt "_"
 msgid ""
-"See if your webcam works when testing it in gstreamer-properties. If it works there, but not in Cheese, "
-"please file a bug report in our  bug tracker."
+"external ref='figures/image-properties.png' "
+"md5='70c32a1dd7c9a20dabef58d0789f2a5a'"
 msgstr ""
-"请查看您的摄像头用 gstreamer-properties 命令测试时是否能正"
-"常工作。如果测试时没问题，但在 Cheese 却无法使用，"
-"请向我们的  bug tracker 版块发送错误报告。"
+"external ref='figures/image-properties.png' "
+"md5='70c32a1dd7c9a20dabef58d0789f2a5a'"
 
-#: C/cheese.xml:639(title)
+#: C/pref-image-properties.page:19(info/desc)
 msgid ""
-"Where does Cheese store my photos and videos?"
-msgstr "Cheese 把我的照片和视频存到什么地方了？"
+"Adjust the saturation, contrast, brightness and hue to make photos and "
+"videos look better."
+msgstr "调整饱和度、对比度、亮度和色度，让照片和视频效果更好。"
 
-#: C/cheese.xml:640(para)
-msgid ""
-"Cheese stores your pictures in a folder called Webcam inside the XDG-"
-"Directory set for Pictures (in most distributions its ~/Pictures/Webcam). "
-"The same applies for Videos: ~/Videos/Webcam. XDG is a standard to declare "
-"default folders in your system. You can find more information about XDG "
-"here."
-msgstr ""
-"Cheese 将您的图片储存在 XDG-Directory 中的图片目录中(在大多数发行版中，该目录"
-"为 ~/Pictures/Webcam)一个叫做 Webcam 的文件夹。视频与此类似：~/Videos/"
-"Webcam。XDM 是一个在您的系统中定义默认文件夹的标准。您可以在此处找到更多关于 XDM 的信息。"
+#: C/pref-image-properties.page:23(page/title)
+msgid "My photos and videos look wrong"
+msgstr "我的照片和视频看起来不正常"
 
-#: C/cheese.xml:648(para)
+#: C/pref-image-properties.page:25(page/p)
 msgid ""
-"If the XDG-Path is not set on your System, cheese has a fallback solution: "
-"it will store both your pictures and videos in ~/.gnome2/cheese/media. This "
-"is the default directory for your media if you have an older version of "
-"Cheese."
+"If your photos or videos are too dark or the colors seem to be wrong, try "
+"adjusting their saturation, contrast, brightness and hue:"
 msgstr ""
-"如果您的系统未设置 XDG-Path，Cheese 有一个备用解决方法：它将会把您的照片和视"
-"频都储存到 ~/.gnome2/cheese/media。此处是老版本的 Cheese 默认的媒体文件储存路径。"
+"如果您的照片或视频太暗或颜色看起来失真，请尝试调整下它们的饱和度、对比度、亮"
+"度和色度。"
 
-#: C/cheese.xml:654(para)
-msgid "How to set an alternate path is described in ."
-msgstr " 中描述了如果设置替代路径。"
+#: C/pref-image-properties.page:33(item/p)
+msgid ""
+"Under Image properties, change the sliders to find the best "
+"settings for your webcam."
+msgstr "在图像属性下，移动滑动条将摄像头调整到最佳设置。"
 
-#: C/cheese.xml:659(para)
+#: C/pref-image-properties.page:37(item/p)
 msgid ""
-"Attention: leave this settings blank if you want Cheese to use the default directories."
-msgstr ""
-"注意：如果想让 Cheese 使用默认目录，请将此项设为"
-"空。"
+"Click Close and check to see if the photos and videos look better."
+msgstr "单击关闭，查看照片和视频是否看起来好一些了。"
 
-#: C/cheese.xml:663(para)
+#: C/pref-image-properties.page:43(figure/title)
 msgid ""
-"You can also save your pictures to an alternate location from within Cheese. "
-"Please see  for information on this."
+"Different options under Image properties (left to right): "
+"applying brightness, contrast, hue and saturation"
 msgstr ""
-"您也可以在 Cheese 中将您的照片存入到不同的地方。请查看  获取更多信息。"
+"图像属性的各个选项(从左到右)分别是：应用亮度、对比度、色度和饱和度"
+
+#: C/pref-image-properties.page:50(item/title)
+msgid "Brightness"
+msgstr "亮度"
 
-#: C/cheese.xml:671(title)
+#: C/pref-image-properties.page:51(item/p)
 msgid ""
-"My Quickcam Express doesn't work with Cheese..."
+"Increasing the brightness will make the photos and videos lighter. However, "
+"if you are in a dark room, increasing the brightness might make the image "
+"look more noisy."
 msgstr ""
-"我的 Quickcam Express 在 Cheese 中能正常工作"
+"增加亮度将会让照片和视频更亮。然而，如果您在暗室，增加照片亮度可能会让图片看"
+"起来噪点更多。"
+
+#: C/pref-image-properties.page:54(item/title)
+msgid "Contrast"
+msgstr "对比度"
 
-#: C/cheese.xml:672(para)
+#: C/pref-image-properties.page:55(item/p)
 msgid ""
-"or gstreamer, and I see errors like \"Not enough buffers. We got 1, we want "
-"at least 2\" in the Cheese output. With driver "
-"\"qc-usb\"."
+"Setting a higher contrast will increase the difference between darker and "
+"lighter colors. If the image looks washed out, try increasing the contrast."
 msgstr ""
-"在 gstreamer 中也不行，我在 Cheees 的输出中看到了像“缓冲区不足。我们期望至少"
-"两个，但现在只有一个”这样的错误。驱动为“qc-usb”."
+"设置较高的对比度将增加暗色和亮色的差别。如果图片看起来有漂洗过的感觉，请尝试"
+"增大对比度。"
 
-#: C/cheese.xml:677(para)
+#: C/pref-image-properties.page:58(item/title)
+msgid "Hue"
+msgstr "色彩值"
+
+#: C/pref-image-properties.page:59(item/p)
 msgid ""
-"Try running qcset /dev/video0 compat=dblbuf to enable "
-"double buffer compatibility mode, then restart Cheese."
+"Changing the hue of the image will add a tint to it. If image seems to be "
+"the wrong color (for example, too yellow), try changing the hue."
 msgstr ""
-"尝试运行 qcset /dev/video0 compat=dblbuf 命令以启用双缓冲"
-"区兼容模式，然后重启 Cheese。"
+"改变照片的色度将会给照片上色。如果照片看起来颜色不对劲（比如，太黄），请修改"
+"色度。"
 
-#: C/cheese.xml:684(title)
-msgid "\"No Camera Found\" Error Message"
-msgstr "“未发现摄像头”错误信息"
+#: C/pref-image-properties.page:62(item/title)
+msgid "Saturation"
+msgstr "饱和度"
 
-#: C/cheese.xml:685(para)
+#: C/pref-image-properties.page:63(item/p)
 msgid ""
-"\"When I launch Cheese, I get the message 'No Camera Found' but I have my "
-"webcam plugged into my computer\"."
-msgstr ""
-"“打开 Cheese 时，我得到一条信息说‘未发现摄像头’，但我明明已经把摄像头插到计算"
-"机上了”。"
+"Reducing the saturation makes the image less colorful. If colors seem too "
+"harsh, reduce the saturation."
+msgstr "减少饱和度，会让照片看起来色彩变淡。如果颜色太鲜艳，请减少饱和度。"
 
-#: C/cheese.xml:688(para)
+#: C/pref-photo-resolution.page:19(info/desc)
 msgid ""
-"There are many situations that can cause this, and the exact problem that is "
-"causing it needs to be isolated. If possible, try each of the following to "
-"try and get your webcam working:"
+"The resolution of a video or photo determines how much detail you can see in "
+"it, changing it will affect the file size."
 msgstr ""
-"引起此问题的可能有很多种，必需找到确切的原因。如果可能的话，请逐个尝试下列办"
-"法看能否使您的摄像头正常工作。"
+"视频或照片的分辨率决定了内容中包含多少的细节。修改分辨率会影响到文件的尺寸。"
+
+#: C/pref-photo-resolution.page:24(page/title)
+msgid "Change the capture resolution of your webcam"
+msgstr "改变摄像头的分辨率"
 
-#: C/cheese.xml:694(para)
+#: C/pref-photo-resolution.page:26(page/p)
 msgid ""
-"Plug your webcam into another computer. If it works there, then it is a "
-"problem with the connection to your computer, or the operating system if it "
-"was a different one on the other computer. Check the ports on your computer "
-"(try another one) and consult support for your particular operating system."
+"Higher resolution generally means better quality images, but photos and "
+"videos with higher resolution take up more space on your hard disk. High "
+"resolution videos, in particular, take up a lot of space."
 msgstr ""
-"将您的摄像头插入另一台计算机。如果此时工作正常，那就说明是在与您的计算机连接"
-"时出了问题。如果那台计算机上装有与您不同的操作系统，那也可能是您的操作系统的"
-"问题。检查您计算机的端口(试试另外一个)并联系您的操作系统的客服。"
+"分辨率更高，图片质量一般会更好，但是高分辨率的照片和视频占用的硬盘空间也会更"
+"多。尤其是高分辨率的视频文件，会占用很大的硬盘空间。"
 
-#: C/cheese.xml:702(para)
+#: C/pref-photo-resolution.page:30(page/p)
 msgid ""
-"See if your camera is being detected by your computer. On Linux, open up the "
-"terminal or console and type \"dmesg\" before you plug in your webcam. "
-"Notice the most recent entries, and then plug in your webcam. Type \"dmesg\" "
-"again and see if the most recent entries differ. If the message mentions a "
-"USB device being detected, and your webcam is the only USB device that has "
-"been changed, then your computer is detecting your webcam fine. If not, then "
-"test to see if the webcam is working on another computer. This may only work "
-"with USB webcams."
+"If you want your images to take up less disk space, reduce the resolution of "
+"your webcam. If you want better quality images, increase the resolution. To "
+"change the webcam resolution:"
 msgstr ""
-"请查看您的摄像头是否被计算机检测到了。在 Linux 中，打开终端或控制台，在插入摄"
-"像头之前键入“dmesg”。注意最新的条目，然后插入摄像头。再次键入“dmesg”看看最新"
-"条目是否有所不同。如果消息中提到有 USB 设备被检测到，而您的摄像头是唯一改变"
-"的 USB 设备，那说明计算机检测到您的摄像头。如果没有检测到，那试试摄像头在其他"
-"计算机上是否能正常工作。此方法仅对 USB 摄像头有效。"
+"如果您想让照片占用较少的磁盘空间，可调低摄像头的分辨率。如果您想要更高质量的"
+"图片文件，就增大分辨率。要改变摄像头的分辨率："
 
-#: C/cheese.xml:712(para)
+#: C/pref-photo-resolution.page:39(item/p)
 msgid ""
-"As Cheese uses the gstreamer backend, it is most likely because gstreamer is "
-"not detecting the webcam (or gstreamer has become corrupt). Please contact "
-"support for the particular operating system that you are running with as "
-"many details as possible. For Ubuntu, please use the Ubuntu Forums."
+"Choose a different resolution from the drop-down list. Some webcams only "
+"support one resolution, so you may not have a choice."
 msgstr ""
-"由于 Cheese 使用 gstreamer 做为其后端，最可能的原因是 gstreamer 未检测到摄像"
-"头(或者 gstreamer 已损坏)。请联系您所使用的操作系统的客服并提供尽可能多的细节"
-"信息。如果是 ubuntu ，请使用 Ubuntu 论坛。"
+"从下拉菜单中选择其他分辨率。一些摄像头只支持一种分辨率，所以您可能无法选择。"
 
-#: C/cheese.xml:723(title)
-msgid "Which cameras are supported?"
-msgstr "Cheese 支持哪些型号的摄像头？"
+#: C/pref-photo-resolution.page:43(item/p)
+msgid "Click Close."
+msgstr "单击关闭。"
 
-#: C/cheese.xml:724(para)
-msgid ""
-"Cheese uses gstreamer for video grabbing. So in principle Cheese supports "
-"any camera that works with GStreamer. That should be any camera which "
-"supports video4linux or video4linux2."
-msgstr ""
-"Cheese 使用 gstreamer 来抓取视频。所以原则上 Cheese 支持所有在 GStreamer 下工"
-"作良好的摄像头。即所有支持 video4linux 或 video4linux2 的摄像头。"
+#: C/video-record.page:19(info/desc)
+msgid "Use your webcam to record short movies for sharing with friends."
+msgstr "使用摄像头录制短片，与朋友分享。"
+
+#: C/video-record.page:22(page/title)
+msgid "Record a video"
+msgstr "录制视频"
 
-#: C/cheese.xml:733(title)
-msgid "About"
-msgstr "关于"
+#: C/video-record.page:24(page/p)
+msgid "To record a video using your webcam:"
+msgstr "要使用摄像头录制视频："
 
-#: C/cheese.xml:734(para)
+#: C/video-record.page:28(item/p)
 msgid ""
-"Cheese was initially written by Daniel G. Siegel dgsiegel@gnome.org. as a Google Summer of Code project. Later, Jaap A. Haitsma "
-"jaap@haitsma.org and others joined Daniel to improve it. To "
-"find more information about Cheese, please visit the Cheese "
-"web page."
+"Make sure that you are in Video mode. If you are, the button in "
+"the middle of the window will say Start Recording."
 msgstr ""
-"Cheese 最初由 G. Siegel dgsiegel@gnome.org 编写，它是谷歌暑期"
-"编程项目中的成员之一。后来， Jaap A. Haitsma jaap@haitsma.org "
-"和其他一些人加入了  Daniel 的项目对它进行了改进。要了解更多关于 Cheese 的信"
-"息，请访问 Cheese web page。"
+"确保您在视频模式模式下。如果已在该模式下，窗口中间的按钮会显示："
+"开始录像。"
 
-#: C/cheese.xml:742(para)
+#: C/video-record.page:30(item/p)
 msgid ""
-"To report a bug or make a suggestion regarding this application, you can "
-"file a bug in our  bug tracker."
+"You can switch to Video mode by clicking the button in the main "
+"window or by clicking CheeseVideo."
 msgstr ""
-"要对本程序或本手册提出建议或报告 bug，请依照Cheese bug "
-"tracker 中的指导行事。"
+"您可以通过点击主窗口上的按钮或点击茄子视频切换到视频模式。"
 
-#: C/cheese.xml:748(para)
+#: C/video-record.page:34(item/p)
 msgid ""
-"This program is distributed under the terms of the GNU General Public "
-"license as published by the Free Software Foundation; either version 2 of "
-"the License, or (at your option) any later version. A copy of this license "
-"can be found at the GNU site, or in the file COPYING included with the source "
-"code of this program."
+"Click Start Recording, or press the spacebar. "
+"Cheese will start recording from your webcam."
 msgstr ""
-"本程序以自由软件基金会发表的 GNU 通用公共许可证(GPL)之条款发布；GPL 应采用第"
-"二版，您也可以采用第三版。您可以在 GNU 网站或本程序的源代码复件中找到此许可证的"
-"复本。"
+"点击开始录像，或按下空格键。茄子 将开始用摄"
+"像头录像。"
 
-#. Put one translator per line, in the form of NAME , YEAR1, YEAR2
-#: C/cheese.xml:0(None)
-msgid "translator-credits"
+#: C/video-record.page:38(item/p)
+msgid ""
+"To stop recording, click Stop Recording or press Esc."
+msgstr "要停止录像，点击停止录像或按下Esc键。"
+
+#: C/video-record.page:43(page/p)
+msgid "Videos are saved in the Ogg Theora (.ogv) format."
+msgstr "视频将被保存为 Ogg Theora(.ogv) 格式。"
+
+#: C/video-record.page:45(page/p)
+msgid ""
+"After you have stopped recording, the video will automatically appear in the "
+"photo stream at the bottom of the Cheese window. From there, you "
+"can play back the video, upload it to a "
+"social network, post it on your blog or YouTube channel, or share it with "
+"friends by email."
 msgstr ""
-"ccrecall \n"
-"arccos (L.Q) , 2009"
+"当您停止录像后，视频将会自动出现在茄子窗口底部的照片集里面。在照片"
+"集中，您可以回放视频，将视频上传到社交网络，"
+"发布到您的博客或 Youtube 频道，或者通过邮件与朋友分享。"
 
-#~ msgid ""
-#~ "Cheese is a video and photo shoot program that "
-#~ "for webcams (or other cameras) and can do some cool effects."
-#~ msgstr ""
-#~ "Cheese 是一个可以为网络摄像头（或者其他数码相"
-#~ "机）拍摄视频和照片的应用程序，并且可以使用一些很酷的特效。"
-
-#~ msgid "2007,2008,2009"
-#~ msgstr "2007,2008,2009"
-
-#~ msgid "Joshua Henderson (joshhendo@gmail.com)"
-#~ msgstr "Joshua Henderson (joshhendo@gmail.com)"
-
-#~ msgid ""
-#~ "Cheese is a video and photo shoot application with cool effects for the "
-#~ "GNOME desktop."
-#~ msgstr ""
-#~ "Cheese 是一个可以拍摄视频和照片的应用程序，并且可以在GNOME 桌"
-#~ "面作一些很酷的特效。"
+#: C/video-record.page:51(page/p)
+msgid ""
+"If you have problems sharing a video with people using other operating "
+"systems (like Windows or Mac OS), you may need to convert it to a different format."
+msgstr ""
+"如果您在与使用其他操作系统(如 Windows 或 Mac OS)的朋友分享视频时出现问题，您"
+"可能需要将视频转换成其他格式。"
 
-#~ msgid "The main screen of Cheese looks like the screenshot below."
-#~ msgstr "Cheese的主画面如下面截图所示。"
diff -Nru cheese-3.5.4/INSTALL cheese-3.5.5/INSTALL
--- cheese-3.5.4/INSTALL	2012-07-16 19:58:28.000000000 +0000
+++ cheese-3.5.5/INSTALL	2012-07-30 14:21:08.000000000 +0000
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
-Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,11 +226,6 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
-
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
diff -Nru cheese-3.5.4/libcheese/cheese-avatar-chooser.c cheese-3.5.5/libcheese/cheese-avatar-chooser.c
--- cheese-3.5.4/libcheese/cheese-avatar-chooser.c	2012-01-16 20:59:38.000000000 +0000
+++ cheese-3.5.5/libcheese/cheese-avatar-chooser.c	2012-07-30 14:14:15.000000000 +0000
@@ -257,7 +257,7 @@
   gtk_dialog_add_buttons (GTK_DIALOG (chooser),
                           GTK_STOCK_CANCEL,
                           GTK_RESPONSE_REJECT,
-                          "Select",
+                          _("Select"),
                           GTK_RESPONSE_ACCEPT,
                           NULL);
   gtk_window_set_title (GTK_WINDOW (chooser), _("Take a photo"));
diff -Nru cheese-3.5.4/libcheese_gtk_la_vala.stamp cheese-3.5.5/libcheese_gtk_la_vala.stamp
--- cheese-3.5.4/libcheese_gtk_la_vala.stamp	2012-07-16 20:08:42.000000000 +0000
+++ cheese-3.5.5/libcheese_gtk_la_vala.stamp	2012-08-06 21:32:17.000000000 +0000
@@ -1 +0,0 @@
-stamp
diff -Nru cheese-3.5.4/libcheese_la_vala.stamp cheese-3.5.5/libcheese_la_vala.stamp
--- cheese-3.5.4/libcheese_la_vala.stamp	2012-07-16 20:08:42.000000000 +0000
+++ cheese-3.5.5/libcheese_la_vala.stamp	2012-08-06 21:32:18.000000000 +0000
@@ -1 +0,0 @@
-stamp
diff -Nru cheese-3.5.4/m4/gtkdoc_jh_check_xml_catalog.m4 cheese-3.5.5/m4/gtkdoc_jh_check_xml_catalog.m4
--- cheese-3.5.4/m4/gtkdoc_jh_check_xml_catalog.m4	2012-01-15 12:11:13.000000000 +0000
+++ cheese-3.5.5/m4/gtkdoc_jh_check_xml_catalog.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-dnl Checks if a particular URI appears in the XML catalog
-dnl Usage:
-dnl	JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-AC_DEFUN([JH_CHECK_XML_CATALOG],
-[
-	AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
-	AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
-	if $jh_found_xmlcatalog && \
-		AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
-		AC_MSG_RESULT([found])
-		ifelse([$3],,,[$3])
-	else
-		AC_MSG_RESULT([not found])
-		ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4])
-	fi
-])
diff -Nru cheese-3.5.4/m4/gtkdoc_jh_path_xml_catalog.m4 cheese-3.5.5/m4/gtkdoc_jh_path_xml_catalog.m4
--- cheese-3.5.4/m4/gtkdoc_jh_path_xml_catalog.m4	2012-01-15 12:11:13.000000000 +0000
+++ cheese-3.5.5/m4/gtkdoc_jh_path_xml_catalog.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-dnl Checks the location of the XML Catalog
-dnl Usage:
-dnl	JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl Defines XMLCATALOG and XML_CATALOG_FILE substitutions
-AC_DEFUN([JH_PATH_XML_CATALOG],
-[
-	dnl check for the presence of the XML catalog
-	AC_ARG_WITH([xml-catalog],
-		AS_HELP_STRING([--with-xml-catalog=CATALOG],
-		[path to xml catalog to use]),,
-		[with_xml_catalog=/etc/xml/catalog])
-	jh_found_xmlcatalog=true
-	XML_CATALOG_FILE="$with_xml_catalog"
-	AC_SUBST([XML_CATALOG_FILE])
-	AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
-	if test -f "$XML_CATALOG_FILE"; then
-		AC_MSG_RESULT([found])
-	else
-		jh_found_xmlcatalog=false
-		AC_MSG_RESULT([not found])
-	fi
-
-	dnl check for the xmlcatalog program
-	AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
-	if test "x$XMLCATALOG" = xno; then
-		jh_found_xmlcatalog=false
-	fi
-
-	if $jh_found_xmlcatalog; then
-		ifelse([$1],,[:],[$1])
-	else
-		ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
-	fi
-])
diff -Nru cheese-3.5.4/m4/jh-xsl.m4 cheese-3.5.5/m4/jh-xsl.m4
--- cheese-3.5.4/m4/jh-xsl.m4	1970-01-01 00:00:00.000000000 +0000
+++ cheese-3.5.5/m4/jh-xsl.m4	2011-12-30 09:11:34.000000000 +0000
@@ -0,0 +1,57 @@
+# Copied from acinclude.m4 of GLib on 2011-12-31
+
+
+# Checks the location of the XML Catalog
+# Usage:
+#   JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# Defines XMLCATALOG and XML_CATALOG_FILE substitutions
+AC_DEFUN([JH_PATH_XML_CATALOG],
+[
+  # check for the presence of the XML catalog
+  AC_ARG_WITH([xml-catalog],
+              AC_HELP_STRING([--with-xml-catalog=CATALOG],
+                             [path to xml catalog to use]),,
+              [with_xml_catalog=/etc/xml/catalog])
+  jh_found_xmlcatalog=true
+  XML_CATALOG_FILE="$with_xml_catalog"
+  AC_SUBST([XML_CATALOG_FILE])
+  AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
+  if test -f "$XML_CATALOG_FILE"; then
+    AC_MSG_RESULT([found])
+  else
+    jh_found_xmlcatalog=false
+    AC_MSG_RESULT([not found])
+  fi
+
+  # check for the xmlcatalog program
+  AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
+  if test "x$XMLCATALOG" = xno; then
+    jh_found_xmlcatalog=false
+  fi
+
+  if $jh_found_xmlcatalog; then
+    ifelse([$1],,[:],[$1])
+  else
+    ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
+  fi
+])
+
+# Checks if a particular URI appears in the XML catalog
+# Usage:
+#   JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+AC_DEFUN([JH_CHECK_XML_CATALOG],
+[
+  AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+  AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+  if $jh_found_xmlcatalog && \
+     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+    AC_MSG_RESULT([found])
+    ifelse([$3],,,[$3
+])dnl
+  else
+    AC_MSG_RESULT([not found])
+    ifelse([$4],,
+       [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],
+       [$4])
+  fi
+])
diff -Nru cheese-3.5.4/m4/libtool.m4 cheese-3.5.5/m4/libtool.m4
--- cheese-3.5.4/m4/libtool.m4	2012-07-16 19:58:09.000000000 +0000
+++ cheese-3.5.5/m4/libtool.m4	2012-08-06 21:27:13.000000000 +0000
@@ -1,8 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,8 +146,6 @@
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -639,7 +637,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -803,7 +801,6 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -825,31 +822,6 @@
 ])# _LT_LANG
 
 
-m4_ifndef([AC_PROG_GO], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -880,10 +852,6 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -986,13 +954,7 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1000,7 +962,6 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
-
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -1012,7 +973,6 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
-
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -1030,9 +990,7 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1077,8 +1035,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
+# _LT_DARWIN_LINKER_FEATURES
+# --------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1089,8 +1047,6 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1374,27 +1330,14 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-*-*solaris*)
+sparc*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1471,13 +1414,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
 case $host_os in
@@ -1657,11 +1600,6 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1701,7 +1639,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2247,7 +2185,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2256,7 +2194,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2321,7 +2259,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2460,7 +2398,7 @@
   ;;
 
 dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2468,6 +2406,10 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2475,11 +2417,18 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[23]].*) objformat=aout ;;
+    freebsd[[123]]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
-  version_type=freebsd-$objformat
+  # Handle Gentoo/FreeBSD as it was Linux
+  case $host_vendor in
+    gentoo)
+      version_type=linux ;;
+    *)
+      version_type=freebsd-$objformat ;;
+  esac
+
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -2490,10 +2439,16 @@
       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
       need_version=yes
       ;;
+    linux)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+      soname_spec='${libname}${release}${shared_ext}$major'
+      need_lib_prefix=no
+      need_version=no
+      ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2513,18 +2468,17 @@
   ;;
 
 gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -2585,7 +2539,7 @@
   ;;
 
 interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2601,7 +2555,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
+		version_type=linux
 	else
 		version_type=irix
 	fi ;;
@@ -2638,9 +2592,9 @@
   dynamic_linker=no
   ;;
 
-# This must be glibc/ELF.
+# This must be Linux ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2669,14 +2623,10 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2707,7 +2657,7 @@
   ;;
 
 newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2776,7 +2726,7 @@
   ;;
 
 solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2801,7 +2751,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2825,7 +2775,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
+    version_type=linux
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2856,7 +2806,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2866,7 +2816,7 @@
   ;;
 
 uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3288,7 +3238,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be glibc/ELF.
+# This must be Linux ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3708,7 +3658,6 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4293,9 +4242,7 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
       ;;
     esac
   else
@@ -4387,33 +4334,18 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	*Sun\ F* | *Sun*Fortran*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
-        *Intel*\ [[CF]]*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  ;;
 	esac
 	;;
       esac
@@ -4573,9 +4505,7 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
+    cl*) ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4600,6 +4530,7 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4850,7 +4781,8 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5145,7 +5077,6 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5192,6 +5123,10 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
+    freebsd1*)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5204,7 +5139,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
+    freebsd2*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5243,6 +5178,7 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5684,6 +5620,9 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+    [[If ld is used when linking, flag to hardcode $libdir into a binary
+    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5841,6 +5780,7 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6210,7 +6150,7 @@
         esac
         ;;
 
-      freebsd2.*)
+      freebsd[[12]]*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6971,18 +6911,12 @@
   }
 };
 _LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7179,6 +7113,7 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7311,6 +7246,7 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7497,77 +7433,6 @@
 ])# _LT_LANG_GCJ_CONFIG
 
 
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7637,13 +7502,6 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
diff -Nru cheese-3.5.4/m4/ltoptions.m4 cheese-3.5.5/m4/ltoptions.m4
--- cheese-3.5.4/m4/ltoptions.m4	2012-07-16 19:58:09.000000000 +0000
+++ cheese-3.5.5/m4/ltoptions.m4	2012-08-06 21:27:13.000000000 +0000
@@ -326,24 +326,9 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+    [AS_HELP_STRING([--with-pic],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
+    [pic_mode="$withval"],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
diff -Nru cheese-3.5.4/m4/ltversion.m4 cheese-3.5.5/m4/ltversion.m4
--- cheese-3.5.4/m4/ltversion.m4	2012-07-16 19:58:10.000000000 +0000
+++ cheese-3.5.5/m4/ltversion.m4	2012-08-06 21:27:13.000000000 +0000
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3337 ltversion.m4
+# serial 3293 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
+m4_define([LT_PACKAGE_VERSION], [2.4])
+m4_define([LT_PACKAGE_REVISION], [1.3293])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.4'
+macro_revision='1.3293'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru cheese-3.5.4/Makefile.am cheese-3.5.5/Makefile.am
--- cheese-3.5.4/Makefile.am	2012-07-16 19:56:58.000000000 +0000
+++ cheese-3.5.5/Makefile.am	2012-08-01 22:20:10.000000000 +0000
@@ -79,6 +79,7 @@
 
 libcheese_gtk_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"cheese-gtk\" \
 	-I$(top_builddir)/libcheese \
 	-I$(top_srcdir)/libcheese \
 	-I$(top_srcdir)/src
@@ -117,6 +118,7 @@
 
 libcheese_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"cheese\" \
 	-I$(top_builddir)/libcheese \
 	-I$(top_srcdir)/libcheese
 
diff -Nru cheese-3.5.4/Makefile.in cheese-3.5.5/Makefile.in
--- cheese-3.5.4/Makefile.in	2012-07-16 20:07:50.000000000 +0000
+++ cheese-3.5.5/Makefile.in	2012-08-06 21:31:42.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -76,12 +76,11 @@
 	tests_test_webcam_button_vala.stamp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \
-	$(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \
 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/jh-xsl.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -112,12 +111,6 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(actionsicon16dir)" \
 	"$(DESTDIR)$(actionsicon22dir)" \
@@ -145,8 +138,8 @@
 	libcheese/libcheese_gtk_la-cheese-widget.lo \
 	libcheese/libcheese_gtk_la-um-crop-area.lo
 libcheese_gtk_la_OBJECTS = $(am_libcheese_gtk_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
 libcheese_gtk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -242,28 +235,28 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
 am__v_CCLD_0 = @echo "  CCLD  " $@;
 VALACOMPILE = $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS)
 LTVALACOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(VALAC) $(AM_VALAFLAGS) \
 	$(VALAFLAGS)
-AM_V_VALAC = $(am__v_VALAC_@AM_V@)
-am__v_VALAC_ = $(am__v_VALAC_@AM_DEFAULT_V@)
+AM_V_VALAC = $(am__v_VALAC_$(V))
+am__v_VALAC_ = $(am__v_VALAC_$(AM_DEFAULT_VERBOSITY))
 am__v_VALAC_0 = @echo "  VALAC " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libcheese_gtk_la_SOURCES) $(libcheese_la_SOURCES) \
 	$(cheese_SOURCES) $(tests_cheese_test_camera_SOURCES) \
@@ -312,11 +305,9 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -345,8 +336,6 @@
 GZIP_ENV = --best
 DIST_ARCHIVES = $(distdir).tar.xz
 distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -575,6 +564,7 @@
 
 libcheese_gtk_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"cheese-gtk\" \
 	-I$(top_builddir)/libcheese \
 	-I$(top_srcdir)/libcheese \
 	-I$(top_srcdir)/src
@@ -613,6 +603,7 @@
 
 libcheese_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"cheese\" \
 	-I$(top_builddir)/libcheese \
 	-I$(top_srcdir)/libcheese
 
@@ -934,7 +925,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-am--refresh: Makefile
+am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -970,8 +961,10 @@
 $(am__aclocal_m4_deps):
 
 cheese-config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
 
 stamp-h1: $(srcdir)/cheese-config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -1038,7 +1031,7 @@
 	libcheese/$(am__dirstamp) libcheese/$(DEPDIR)/$(am__dirstamp)
 libcheese/libcheese_gtk_la-um-crop-area.lo: libcheese/$(am__dirstamp) \
 	libcheese/$(DEPDIR)/$(am__dirstamp)
-libcheese-gtk.la: $(libcheese_gtk_la_OBJECTS) $(libcheese_gtk_la_DEPENDENCIES) $(EXTRA_libcheese_gtk_la_DEPENDENCIES) 
+libcheese-gtk.la: $(libcheese_gtk_la_OBJECTS) $(libcheese_gtk_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libcheese_gtk_la_LINK) -rpath $(libdir) $(libcheese_gtk_la_OBJECTS) $(libcheese_gtk_la_LIBADD) $(LIBS)
 libcheese/libcheese_la-cheese-enums.lo: libcheese/$(am__dirstamp) \
 	libcheese/$(DEPDIR)/$(am__dirstamp)
@@ -1054,7 +1047,7 @@
 	libcheese/$(DEPDIR)/$(am__dirstamp)
 libcheese/libcheese_la-cheese.lo: libcheese/$(am__dirstamp) \
 	libcheese/$(DEPDIR)/$(am__dirstamp)
-libcheese.la: $(libcheese_la_OBJECTS) $(libcheese_la_DEPENDENCIES) $(EXTRA_libcheese_la_DEPENDENCIES) 
+libcheese.la: $(libcheese_la_OBJECTS) $(libcheese_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libcheese_la_LINK) -rpath $(libdir) $(libcheese_la_OBJECTS) $(libcheese_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -1150,7 +1143,7 @@
 src/thumbview/cheese-eog-thumb-nav.$(OBJEXT):  \
 	src/thumbview/$(am__dirstamp) \
 	src/thumbview/$(DEPDIR)/$(am__dirstamp)
-cheese$(EXEEXT): $(cheese_OBJECTS) $(cheese_DEPENDENCIES) $(EXTRA_cheese_DEPENDENCIES) 
+cheese$(EXEEXT): $(cheese_OBJECTS) $(cheese_DEPENDENCIES) 
 	@rm -f cheese$(EXEEXT)
 	$(AM_V_CCLD)$(cheese_LINK) $(cheese_OBJECTS) $(cheese_LDADD) $(LIBS)
 tests/$(am__dirstamp):
@@ -1161,44 +1154,44 @@
 	@: > tests/$(DEPDIR)/$(am__dirstamp)
 tests/tests_cheese_test_camera-cheese-test-camera.$(OBJEXT):  \
 	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
-tests/cheese-test-camera$(EXEEXT): $(tests_cheese_test_camera_OBJECTS) $(tests_cheese_test_camera_DEPENDENCIES) $(EXTRA_tests_cheese_test_camera_DEPENDENCIES) tests/$(am__dirstamp)
+tests/cheese-test-camera$(EXEEXT): $(tests_cheese_test_camera_OBJECTS) $(tests_cheese_test_camera_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/cheese-test-camera$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_cheese_test_camera_OBJECTS) $(tests_cheese_test_camera_LDADD) $(LIBS)
 tests/tests_cheese_test_chooser-cheese-test-chooser.$(OBJEXT):  \
 	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
-tests/cheese-test-chooser$(EXEEXT): $(tests_cheese_test_chooser_OBJECTS) $(tests_cheese_test_chooser_DEPENDENCIES) $(EXTRA_tests_cheese_test_chooser_DEPENDENCIES) tests/$(am__dirstamp)
+tests/cheese-test-chooser$(EXEEXT): $(tests_cheese_test_chooser_OBJECTS) $(tests_cheese_test_chooser_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/cheese-test-chooser$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_cheese_test_chooser_OBJECTS) $(tests_cheese_test_chooser_LDADD) $(LIBS)
 tests/tests_cheese_test_flash-cheese-test-flash.$(OBJEXT):  \
 	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
-tests/cheese-test-flash$(EXEEXT): $(tests_cheese_test_flash_OBJECTS) $(tests_cheese_test_flash_DEPENDENCIES) $(EXTRA_tests_cheese_test_flash_DEPENDENCIES) tests/$(am__dirstamp)
+tests/cheese-test-flash$(EXEEXT): $(tests_cheese_test_flash_OBJECTS) $(tests_cheese_test_flash_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/cheese-test-flash$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_cheese_test_flash_OBJECTS) $(tests_cheese_test_flash_LDADD) $(LIBS)
 tests/tests_cheese_test_monitor-cheese-test-monitor.$(OBJEXT):  \
 	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
-tests/cheese-test-monitor$(EXEEXT): $(tests_cheese_test_monitor_OBJECTS) $(tests_cheese_test_monitor_DEPENDENCIES) $(EXTRA_tests_cheese_test_monitor_DEPENDENCIES) tests/$(am__dirstamp)
+tests/cheese-test-monitor$(EXEEXT): $(tests_cheese_test_monitor_OBJECTS) $(tests_cheese_test_monitor_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/cheese-test-monitor$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_cheese_test_monitor_OBJECTS) $(tests_cheese_test_monitor_LDADD) $(LIBS)
 tests/tests_cheese_test_widget-cheese-test-widget.$(OBJEXT):  \
 	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
-tests/cheese-test-widget$(EXEEXT): $(tests_cheese_test_widget_OBJECTS) $(tests_cheese_test_widget_DEPENDENCIES) $(EXTRA_tests_cheese_test_widget_DEPENDENCIES) tests/$(am__dirstamp)
+tests/cheese-test-widget$(EXEEXT): $(tests_cheese_test_widget_OBJECTS) $(tests_cheese_test_widget_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/cheese-test-widget$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_cheese_test_widget_OBJECTS) $(tests_cheese_test_widget_LDADD) $(LIBS)
 tests/tests_test_libcheese-test-libcheese.$(OBJEXT):  \
 	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
-tests/test-libcheese$(EXEEXT): $(tests_test_libcheese_OBJECTS) $(tests_test_libcheese_DEPENDENCIES) $(EXTRA_tests_test_libcheese_DEPENDENCIES) tests/$(am__dirstamp)
+tests/test-libcheese$(EXEEXT): $(tests_test_libcheese_OBJECTS) $(tests_test_libcheese_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/test-libcheese$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_test_libcheese_OBJECTS) $(tests_test_libcheese_LDADD) $(LIBS)
 libcheese/tests_test_libcheese_gtk-um-crop-area.$(OBJEXT):  \
 	libcheese/$(am__dirstamp) libcheese/$(DEPDIR)/$(am__dirstamp)
 tests/tests_test_libcheese_gtk-test-libcheese-gtk.$(OBJEXT):  \
 	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
-tests/test-libcheese-gtk$(EXEEXT): $(tests_test_libcheese_gtk_OBJECTS) $(tests_test_libcheese_gtk_DEPENDENCIES) $(EXTRA_tests_test_libcheese_gtk_DEPENDENCIES) tests/$(am__dirstamp)
+tests/test-libcheese-gtk$(EXEEXT): $(tests_test_libcheese_gtk_OBJECTS) $(tests_test_libcheese_gtk_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/test-libcheese-gtk$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_test_libcheese_gtk_OBJECTS) $(tests_test_libcheese_gtk_LDADD) $(LIBS)
 tests/tests_test_webcam_button-test-webcam-button.$(OBJEXT):  \
 	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
-tests/test-webcam-button$(EXEEXT): $(tests_test_webcam_button_OBJECTS) $(tests_test_webcam_button_DEPENDENCIES) $(EXTRA_tests_test_webcam_button_DEPENDENCIES) tests/$(am__dirstamp)
+tests/test-webcam-button$(EXEEXT): $(tests_test_webcam_button_OBJECTS) $(tests_test_webcam_button_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/test-webcam-button$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tests_test_webcam_button_OBJECTS) $(tests_test_webcam_button_LDADD) $(LIBS)
 
@@ -1288,442 +1281,483 @@
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libcheese/libcheese_gtk_la-cheese-avatar-chooser.lo: libcheese/cheese-avatar-chooser.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_gtk_la-cheese-avatar-chooser.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-avatar-chooser.Tpo -c -o libcheese/libcheese_gtk_la-cheese-avatar-chooser.lo `test -f 'libcheese/cheese-avatar-chooser.c' || echo '$(srcdir)/'`libcheese/cheese-avatar-chooser.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-avatar-chooser.Tpo libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-avatar-chooser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/cheese-avatar-chooser.c' object='libcheese/libcheese_gtk_la-cheese-avatar-chooser.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/cheese-avatar-chooser.c' object='libcheese/libcheese_gtk_la-cheese-avatar-chooser.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-cheese-avatar-chooser.lo `test -f 'libcheese/cheese-avatar-chooser.c' || echo '$(srcdir)/'`libcheese/cheese-avatar-chooser.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-cheese-avatar-chooser.lo `test -f 'libcheese/cheese-avatar-chooser.c' || echo '$(srcdir)/'`libcheese/cheese-avatar-chooser.c
 
 libcheese/libcheese_gtk_la-totem-aspect-frame.lo: libcheese/totem-aspect-frame.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_gtk_la-totem-aspect-frame.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_gtk_la-totem-aspect-frame.Tpo -c -o libcheese/libcheese_gtk_la-totem-aspect-frame.lo `test -f 'libcheese/totem-aspect-frame.c' || echo '$(srcdir)/'`libcheese/totem-aspect-frame.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_gtk_la-totem-aspect-frame.Tpo libcheese/$(DEPDIR)/libcheese_gtk_la-totem-aspect-frame.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/totem-aspect-frame.c' object='libcheese/libcheese_gtk_la-totem-aspect-frame.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/totem-aspect-frame.c' object='libcheese/libcheese_gtk_la-totem-aspect-frame.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-totem-aspect-frame.lo `test -f 'libcheese/totem-aspect-frame.c' || echo '$(srcdir)/'`libcheese/totem-aspect-frame.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-totem-aspect-frame.lo `test -f 'libcheese/totem-aspect-frame.c' || echo '$(srcdir)/'`libcheese/totem-aspect-frame.c
 
 libcheese/libcheese_gtk_la-cheese-flash.lo: libcheese/cheese-flash.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_gtk_la-cheese-flash.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-flash.Tpo -c -o libcheese/libcheese_gtk_la-cheese-flash.lo `test -f 'libcheese/cheese-flash.c' || echo '$(srcdir)/'`libcheese/cheese-flash.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-flash.Tpo libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-flash.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/cheese-flash.c' object='libcheese/libcheese_gtk_la-cheese-flash.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/cheese-flash.c' object='libcheese/libcheese_gtk_la-cheese-flash.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-cheese-flash.lo `test -f 'libcheese/cheese-flash.c' || echo '$(srcdir)/'`libcheese/cheese-flash.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-cheese-flash.lo `test -f 'libcheese/cheese-flash.c' || echo '$(srcdir)/'`libcheese/cheese-flash.c
 
 libcheese/libcheese_gtk_la-cheese-gtk.lo: libcheese/cheese-gtk.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_gtk_la-cheese-gtk.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-gtk.Tpo -c -o libcheese/libcheese_gtk_la-cheese-gtk.lo `test -f 'libcheese/cheese-gtk.c' || echo '$(srcdir)/'`libcheese/cheese-gtk.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-gtk.Tpo libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-gtk.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/cheese-gtk.c' object='libcheese/libcheese_gtk_la-cheese-gtk.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/cheese-gtk.c' object='libcheese/libcheese_gtk_la-cheese-gtk.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-cheese-gtk.lo `test -f 'libcheese/cheese-gtk.c' || echo '$(srcdir)/'`libcheese/cheese-gtk.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-cheese-gtk.lo `test -f 'libcheese/cheese-gtk.c' || echo '$(srcdir)/'`libcheese/cheese-gtk.c
 
 libcheese/libcheese_gtk_la-cheese-widget.lo: libcheese/cheese-widget.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_gtk_la-cheese-widget.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-widget.Tpo -c -o libcheese/libcheese_gtk_la-cheese-widget.lo `test -f 'libcheese/cheese-widget.c' || echo '$(srcdir)/'`libcheese/cheese-widget.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-widget.Tpo libcheese/$(DEPDIR)/libcheese_gtk_la-cheese-widget.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/cheese-widget.c' object='libcheese/libcheese_gtk_la-cheese-widget.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/cheese-widget.c' object='libcheese/libcheese_gtk_la-cheese-widget.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-cheese-widget.lo `test -f 'libcheese/cheese-widget.c' || echo '$(srcdir)/'`libcheese/cheese-widget.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-cheese-widget.lo `test -f 'libcheese/cheese-widget.c' || echo '$(srcdir)/'`libcheese/cheese-widget.c
 
 libcheese/libcheese_gtk_la-um-crop-area.lo: libcheese/um-crop-area.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_gtk_la-um-crop-area.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_gtk_la-um-crop-area.Tpo -c -o libcheese/libcheese_gtk_la-um-crop-area.lo `test -f 'libcheese/um-crop-area.c' || echo '$(srcdir)/'`libcheese/um-crop-area.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_gtk_la-um-crop-area.Tpo libcheese/$(DEPDIR)/libcheese_gtk_la-um-crop-area.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/um-crop-area.c' object='libcheese/libcheese_gtk_la-um-crop-area.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/um-crop-area.c' object='libcheese/libcheese_gtk_la-um-crop-area.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-um-crop-area.lo `test -f 'libcheese/um-crop-area.c' || echo '$(srcdir)/'`libcheese/um-crop-area.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_gtk_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_gtk_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_gtk_la-um-crop-area.lo `test -f 'libcheese/um-crop-area.c' || echo '$(srcdir)/'`libcheese/um-crop-area.c
 
 libcheese/libcheese_la-cheese-enums.lo: libcheese/cheese-enums.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_la-cheese-enums.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_la-cheese-enums.Tpo -c -o libcheese/libcheese_la-cheese-enums.lo `test -f 'libcheese/cheese-enums.c' || echo '$(srcdir)/'`libcheese/cheese-enums.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_la-cheese-enums.Tpo libcheese/$(DEPDIR)/libcheese_la-cheese-enums.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/cheese-enums.c' object='libcheese/libcheese_la-cheese-enums.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/cheese-enums.c' object='libcheese/libcheese_la-cheese-enums.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-enums.lo `test -f 'libcheese/cheese-enums.c' || echo '$(srcdir)/'`libcheese/cheese-enums.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-enums.lo `test -f 'libcheese/cheese-enums.c' || echo '$(srcdir)/'`libcheese/cheese-enums.c
 
 libcheese/libcheese_la-cheese-camera.lo: libcheese/cheese-camera.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_la-cheese-camera.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_la-cheese-camera.Tpo -c -o libcheese/libcheese_la-cheese-camera.lo `test -f 'libcheese/cheese-camera.c' || echo '$(srcdir)/'`libcheese/cheese-camera.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_la-cheese-camera.Tpo libcheese/$(DEPDIR)/libcheese_la-cheese-camera.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/cheese-camera.c' object='libcheese/libcheese_la-cheese-camera.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/cheese-camera.c' object='libcheese/libcheese_la-cheese-camera.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-camera.lo `test -f 'libcheese/cheese-camera.c' || echo '$(srcdir)/'`libcheese/cheese-camera.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-camera.lo `test -f 'libcheese/cheese-camera.c' || echo '$(srcdir)/'`libcheese/cheese-camera.c
 
 libcheese/libcheese_la-cheese-camera-device.lo: libcheese/cheese-camera-device.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_la-cheese-camera-device.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_la-cheese-camera-device.Tpo -c -o libcheese/libcheese_la-cheese-camera-device.lo `test -f 'libcheese/cheese-camera-device.c' || echo '$(srcdir)/'`libcheese/cheese-camera-device.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_la-cheese-camera-device.Tpo libcheese/$(DEPDIR)/libcheese_la-cheese-camera-device.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/cheese-camera-device.c' object='libcheese/libcheese_la-cheese-camera-device.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/cheese-camera-device.c' object='libcheese/libcheese_la-cheese-camera-device.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-camera-device.lo `test -f 'libcheese/cheese-camera-device.c' || echo '$(srcdir)/'`libcheese/cheese-camera-device.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-camera-device.lo `test -f 'libcheese/cheese-camera-device.c' || echo '$(srcdir)/'`libcheese/cheese-camera-device.c
 
 libcheese/libcheese_la-cheese-camera-device-monitor.lo: libcheese/cheese-camera-device-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_la-cheese-camera-device-monitor.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_la-cheese-camera-device-monitor.Tpo -c -o libcheese/libcheese_la-cheese-camera-device-monitor.lo `test -f 'libcheese/cheese-camera-device-monitor.c' || echo '$(srcdir)/'`libcheese/cheese-camera-device-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_la-cheese-camera-device-monitor.Tpo libcheese/$(DEPDIR)/libcheese_la-cheese-camera-device-monitor.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/cheese-camera-device-monitor.c' object='libcheese/libcheese_la-cheese-camera-device-monitor.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/cheese-camera-device-monitor.c' object='libcheese/libcheese_la-cheese-camera-device-monitor.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-camera-device-monitor.lo `test -f 'libcheese/cheese-camera-device-monitor.c' || echo '$(srcdir)/'`libcheese/cheese-camera-device-monitor.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-camera-device-monitor.lo `test -f 'libcheese/cheese-camera-device-monitor.c' || echo '$(srcdir)/'`libcheese/cheese-camera-device-monitor.c
 
 libcheese/libcheese_la-cheese-effect.lo: libcheese/cheese-effect.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_la-cheese-effect.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_la-cheese-effect.Tpo -c -o libcheese/libcheese_la-cheese-effect.lo `test -f 'libcheese/cheese-effect.c' || echo '$(srcdir)/'`libcheese/cheese-effect.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_la-cheese-effect.Tpo libcheese/$(DEPDIR)/libcheese_la-cheese-effect.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/cheese-effect.c' object='libcheese/libcheese_la-cheese-effect.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/cheese-effect.c' object='libcheese/libcheese_la-cheese-effect.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-effect.lo `test -f 'libcheese/cheese-effect.c' || echo '$(srcdir)/'`libcheese/cheese-effect.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-effect.lo `test -f 'libcheese/cheese-effect.c' || echo '$(srcdir)/'`libcheese/cheese-effect.c
 
 libcheese/libcheese_la-cheese-fileutil.lo: libcheese/cheese-fileutil.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_la-cheese-fileutil.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_la-cheese-fileutil.Tpo -c -o libcheese/libcheese_la-cheese-fileutil.lo `test -f 'libcheese/cheese-fileutil.c' || echo '$(srcdir)/'`libcheese/cheese-fileutil.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_la-cheese-fileutil.Tpo libcheese/$(DEPDIR)/libcheese_la-cheese-fileutil.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/cheese-fileutil.c' object='libcheese/libcheese_la-cheese-fileutil.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/cheese-fileutil.c' object='libcheese/libcheese_la-cheese-fileutil.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-fileutil.lo `test -f 'libcheese/cheese-fileutil.c' || echo '$(srcdir)/'`libcheese/cheese-fileutil.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese-fileutil.lo `test -f 'libcheese/cheese-fileutil.c' || echo '$(srcdir)/'`libcheese/cheese-fileutil.c
 
 libcheese/libcheese_la-cheese.lo: libcheese/cheese.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -MT libcheese/libcheese_la-cheese.lo -MD -MP -MF libcheese/$(DEPDIR)/libcheese_la-cheese.Tpo -c -o libcheese/libcheese_la-cheese.lo `test -f 'libcheese/cheese.c' || echo '$(srcdir)/'`libcheese/cheese.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/libcheese_la-cheese.Tpo libcheese/$(DEPDIR)/libcheese_la-cheese.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/cheese.c' object='libcheese/libcheese_la-cheese.lo' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/cheese.c' object='libcheese/libcheese_la-cheese.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese.lo `test -f 'libcheese/cheese.c' || echo '$(srcdir)/'`libcheese/cheese.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcheese_la_CPPFLAGS) $(CPPFLAGS) $(libcheese_la_CFLAGS) $(CFLAGS) -c -o libcheese/libcheese_la-cheese.lo `test -f 'libcheese/cheese.c' || echo '$(srcdir)/'`libcheese/cheese.c
 
 src/cheese-cheese-countdown.o: src/cheese-countdown.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-countdown.o -MD -MP -MF src/$(DEPDIR)/cheese-cheese-countdown.Tpo -c -o src/cheese-cheese-countdown.o `test -f 'src/cheese-countdown.c' || echo '$(srcdir)/'`src/cheese-countdown.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-countdown.Tpo src/$(DEPDIR)/cheese-cheese-countdown.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-countdown.c' object='src/cheese-cheese-countdown.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-countdown.c' object='src/cheese-cheese-countdown.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-countdown.o `test -f 'src/cheese-countdown.c' || echo '$(srcdir)/'`src/cheese-countdown.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-countdown.o `test -f 'src/cheese-countdown.c' || echo '$(srcdir)/'`src/cheese-countdown.c
 
 src/cheese-cheese-countdown.obj: src/cheese-countdown.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-countdown.obj -MD -MP -MF src/$(DEPDIR)/cheese-cheese-countdown.Tpo -c -o src/cheese-cheese-countdown.obj `if test -f 'src/cheese-countdown.c'; then $(CYGPATH_W) 'src/cheese-countdown.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-countdown.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-countdown.Tpo src/$(DEPDIR)/cheese-cheese-countdown.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-countdown.c' object='src/cheese-cheese-countdown.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-countdown.c' object='src/cheese-cheese-countdown.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-countdown.obj `if test -f 'src/cheese-countdown.c'; then $(CYGPATH_W) 'src/cheese-countdown.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-countdown.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-countdown.obj `if test -f 'src/cheese-countdown.c'; then $(CYGPATH_W) 'src/cheese-countdown.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-countdown.c'; fi`
 
 src/cheese-cheese-effects-manager.o: src/cheese-effects-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-effects-manager.o -MD -MP -MF src/$(DEPDIR)/cheese-cheese-effects-manager.Tpo -c -o src/cheese-cheese-effects-manager.o `test -f 'src/cheese-effects-manager.c' || echo '$(srcdir)/'`src/cheese-effects-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-effects-manager.Tpo src/$(DEPDIR)/cheese-cheese-effects-manager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-effects-manager.c' object='src/cheese-cheese-effects-manager.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-effects-manager.c' object='src/cheese-cheese-effects-manager.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-effects-manager.o `test -f 'src/cheese-effects-manager.c' || echo '$(srcdir)/'`src/cheese-effects-manager.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-effects-manager.o `test -f 'src/cheese-effects-manager.c' || echo '$(srcdir)/'`src/cheese-effects-manager.c
 
 src/cheese-cheese-effects-manager.obj: src/cheese-effects-manager.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-effects-manager.obj -MD -MP -MF src/$(DEPDIR)/cheese-cheese-effects-manager.Tpo -c -o src/cheese-cheese-effects-manager.obj `if test -f 'src/cheese-effects-manager.c'; then $(CYGPATH_W) 'src/cheese-effects-manager.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-effects-manager.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-effects-manager.Tpo src/$(DEPDIR)/cheese-cheese-effects-manager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-effects-manager.c' object='src/cheese-cheese-effects-manager.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-effects-manager.c' object='src/cheese-cheese-effects-manager.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-effects-manager.obj `if test -f 'src/cheese-effects-manager.c'; then $(CYGPATH_W) 'src/cheese-effects-manager.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-effects-manager.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-effects-manager.obj `if test -f 'src/cheese-effects-manager.c'; then $(CYGPATH_W) 'src/cheese-effects-manager.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-effects-manager.c'; fi`
 
 src/cheese-cheese-preferences.o: src/cheese-preferences.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-preferences.o -MD -MP -MF src/$(DEPDIR)/cheese-cheese-preferences.Tpo -c -o src/cheese-cheese-preferences.o `test -f 'src/cheese-preferences.c' || echo '$(srcdir)/'`src/cheese-preferences.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-preferences.Tpo src/$(DEPDIR)/cheese-cheese-preferences.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-preferences.c' object='src/cheese-cheese-preferences.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-preferences.c' object='src/cheese-cheese-preferences.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-preferences.o `test -f 'src/cheese-preferences.c' || echo '$(srcdir)/'`src/cheese-preferences.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-preferences.o `test -f 'src/cheese-preferences.c' || echo '$(srcdir)/'`src/cheese-preferences.c
 
 src/cheese-cheese-preferences.obj: src/cheese-preferences.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-preferences.obj -MD -MP -MF src/$(DEPDIR)/cheese-cheese-preferences.Tpo -c -o src/cheese-cheese-preferences.obj `if test -f 'src/cheese-preferences.c'; then $(CYGPATH_W) 'src/cheese-preferences.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-preferences.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-preferences.Tpo src/$(DEPDIR)/cheese-cheese-preferences.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-preferences.c' object='src/cheese-cheese-preferences.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-preferences.c' object='src/cheese-cheese-preferences.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-preferences.obj `if test -f 'src/cheese-preferences.c'; then $(CYGPATH_W) 'src/cheese-preferences.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-preferences.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-preferences.obj `if test -f 'src/cheese-preferences.c'; then $(CYGPATH_W) 'src/cheese-preferences.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-preferences.c'; fi`
 
 src/cheese-cheese-window.o: src/cheese-window.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-window.o -MD -MP -MF src/$(DEPDIR)/cheese-cheese-window.Tpo -c -o src/cheese-cheese-window.o `test -f 'src/cheese-window.c' || echo '$(srcdir)/'`src/cheese-window.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-window.Tpo src/$(DEPDIR)/cheese-cheese-window.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-window.c' object='src/cheese-cheese-window.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-window.c' object='src/cheese-cheese-window.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-window.o `test -f 'src/cheese-window.c' || echo '$(srcdir)/'`src/cheese-window.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-window.o `test -f 'src/cheese-window.c' || echo '$(srcdir)/'`src/cheese-window.c
 
 src/cheese-cheese-window.obj: src/cheese-window.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-window.obj -MD -MP -MF src/$(DEPDIR)/cheese-cheese-window.Tpo -c -o src/cheese-cheese-window.obj `if test -f 'src/cheese-window.c'; then $(CYGPATH_W) 'src/cheese-window.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-window.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-window.Tpo src/$(DEPDIR)/cheese-cheese-window.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-window.c' object='src/cheese-cheese-window.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-window.c' object='src/cheese-cheese-window.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-window.obj `if test -f 'src/cheese-window.c'; then $(CYGPATH_W) 'src/cheese-window.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-window.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-window.obj `if test -f 'src/cheese-window.c'; then $(CYGPATH_W) 'src/cheese-window.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-window.c'; fi`
 
 src/cheese-cheese-main.o: src/cheese-main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-main.o -MD -MP -MF src/$(DEPDIR)/cheese-cheese-main.Tpo -c -o src/cheese-cheese-main.o `test -f 'src/cheese-main.c' || echo '$(srcdir)/'`src/cheese-main.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-main.Tpo src/$(DEPDIR)/cheese-cheese-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-main.c' object='src/cheese-cheese-main.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-main.c' object='src/cheese-cheese-main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-main.o `test -f 'src/cheese-main.c' || echo '$(srcdir)/'`src/cheese-main.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-main.o `test -f 'src/cheese-main.c' || echo '$(srcdir)/'`src/cheese-main.c
 
 src/cheese-cheese-main.obj: src/cheese-main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-main.obj -MD -MP -MF src/$(DEPDIR)/cheese-cheese-main.Tpo -c -o src/cheese-cheese-main.obj `if test -f 'src/cheese-main.c'; then $(CYGPATH_W) 'src/cheese-main.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-main.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-main.Tpo src/$(DEPDIR)/cheese-cheese-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-main.c' object='src/cheese-cheese-main.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-main.c' object='src/cheese-cheese-main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-main.obj `if test -f 'src/cheese-main.c'; then $(CYGPATH_W) 'src/cheese-main.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-main.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-main.obj `if test -f 'src/cheese-main.c'; then $(CYGPATH_W) 'src/cheese-main.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-main.c'; fi`
 
 src/cheese-cheese-shareable-media.o: src/cheese-shareable-media.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-shareable-media.o -MD -MP -MF src/$(DEPDIR)/cheese-cheese-shareable-media.Tpo -c -o src/cheese-cheese-shareable-media.o `test -f 'src/cheese-shareable-media.c' || echo '$(srcdir)/'`src/cheese-shareable-media.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-shareable-media.Tpo src/$(DEPDIR)/cheese-cheese-shareable-media.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-shareable-media.c' object='src/cheese-cheese-shareable-media.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-shareable-media.c' object='src/cheese-cheese-shareable-media.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-shareable-media.o `test -f 'src/cheese-shareable-media.c' || echo '$(srcdir)/'`src/cheese-shareable-media.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-shareable-media.o `test -f 'src/cheese-shareable-media.c' || echo '$(srcdir)/'`src/cheese-shareable-media.c
 
 src/cheese-cheese-shareable-media.obj: src/cheese-shareable-media.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/cheese-cheese-shareable-media.obj -MD -MP -MF src/$(DEPDIR)/cheese-cheese-shareable-media.Tpo -c -o src/cheese-cheese-shareable-media.obj `if test -f 'src/cheese-shareable-media.c'; then $(CYGPATH_W) 'src/cheese-shareable-media.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-shareable-media.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/cheese-cheese-shareable-media.Tpo src/$(DEPDIR)/cheese-cheese-shareable-media.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/cheese-shareable-media.c' object='src/cheese-cheese-shareable-media.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/cheese-shareable-media.c' object='src/cheese-cheese-shareable-media.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-shareable-media.obj `if test -f 'src/cheese-shareable-media.c'; then $(CYGPATH_W) 'src/cheese-shareable-media.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-shareable-media.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/cheese-cheese-shareable-media.obj `if test -f 'src/cheese-shareable-media.c'; then $(CYGPATH_W) 'src/cheese-shareable-media.c'; else $(CYGPATH_W) '$(srcdir)/src/cheese-shareable-media.c'; fi`
 
 src/thumbview/cheese-cheese-thumb-view.o: src/thumbview/cheese-thumb-view.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/thumbview/cheese-cheese-thumb-view.o -MD -MP -MF src/thumbview/$(DEPDIR)/cheese-cheese-thumb-view.Tpo -c -o src/thumbview/cheese-cheese-thumb-view.o `test -f 'src/thumbview/cheese-thumb-view.c' || echo '$(srcdir)/'`src/thumbview/cheese-thumb-view.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/thumbview/$(DEPDIR)/cheese-cheese-thumb-view.Tpo src/thumbview/$(DEPDIR)/cheese-cheese-thumb-view.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/thumbview/cheese-thumb-view.c' object='src/thumbview/cheese-cheese-thumb-view.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/thumbview/cheese-thumb-view.c' object='src/thumbview/cheese-cheese-thumb-view.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-cheese-thumb-view.o `test -f 'src/thumbview/cheese-thumb-view.c' || echo '$(srcdir)/'`src/thumbview/cheese-thumb-view.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-cheese-thumb-view.o `test -f 'src/thumbview/cheese-thumb-view.c' || echo '$(srcdir)/'`src/thumbview/cheese-thumb-view.c
 
 src/thumbview/cheese-cheese-thumb-view.obj: src/thumbview/cheese-thumb-view.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/thumbview/cheese-cheese-thumb-view.obj -MD -MP -MF src/thumbview/$(DEPDIR)/cheese-cheese-thumb-view.Tpo -c -o src/thumbview/cheese-cheese-thumb-view.obj `if test -f 'src/thumbview/cheese-thumb-view.c'; then $(CYGPATH_W) 'src/thumbview/cheese-thumb-view.c'; else $(CYGPATH_W) '$(srcdir)/src/thumbview/cheese-thumb-view.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/thumbview/$(DEPDIR)/cheese-cheese-thumb-view.Tpo src/thumbview/$(DEPDIR)/cheese-cheese-thumb-view.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/thumbview/cheese-thumb-view.c' object='src/thumbview/cheese-cheese-thumb-view.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/thumbview/cheese-thumb-view.c' object='src/thumbview/cheese-cheese-thumb-view.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-cheese-thumb-view.obj `if test -f 'src/thumbview/cheese-thumb-view.c'; then $(CYGPATH_W) 'src/thumbview/cheese-thumb-view.c'; else $(CYGPATH_W) '$(srcdir)/src/thumbview/cheese-thumb-view.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-cheese-thumb-view.obj `if test -f 'src/thumbview/cheese-thumb-view.c'; then $(CYGPATH_W) 'src/thumbview/cheese-thumb-view.c'; else $(CYGPATH_W) '$(srcdir)/src/thumbview/cheese-thumb-view.c'; fi`
 
 src/thumbview/cheese-cheese-thumbnail.o: src/thumbview/cheese-thumbnail.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/thumbview/cheese-cheese-thumbnail.o -MD -MP -MF src/thumbview/$(DEPDIR)/cheese-cheese-thumbnail.Tpo -c -o src/thumbview/cheese-cheese-thumbnail.o `test -f 'src/thumbview/cheese-thumbnail.c' || echo '$(srcdir)/'`src/thumbview/cheese-thumbnail.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/thumbview/$(DEPDIR)/cheese-cheese-thumbnail.Tpo src/thumbview/$(DEPDIR)/cheese-cheese-thumbnail.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/thumbview/cheese-thumbnail.c' object='src/thumbview/cheese-cheese-thumbnail.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/thumbview/cheese-thumbnail.c' object='src/thumbview/cheese-cheese-thumbnail.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-cheese-thumbnail.o `test -f 'src/thumbview/cheese-thumbnail.c' || echo '$(srcdir)/'`src/thumbview/cheese-thumbnail.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-cheese-thumbnail.o `test -f 'src/thumbview/cheese-thumbnail.c' || echo '$(srcdir)/'`src/thumbview/cheese-thumbnail.c
 
 src/thumbview/cheese-cheese-thumbnail.obj: src/thumbview/cheese-thumbnail.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/thumbview/cheese-cheese-thumbnail.obj -MD -MP -MF src/thumbview/$(DEPDIR)/cheese-cheese-thumbnail.Tpo -c -o src/thumbview/cheese-cheese-thumbnail.obj `if test -f 'src/thumbview/cheese-thumbnail.c'; then $(CYGPATH_W) 'src/thumbview/cheese-thumbnail.c'; else $(CYGPATH_W) '$(srcdir)/src/thumbview/cheese-thumbnail.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/thumbview/$(DEPDIR)/cheese-cheese-thumbnail.Tpo src/thumbview/$(DEPDIR)/cheese-cheese-thumbnail.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/thumbview/cheese-thumbnail.c' object='src/thumbview/cheese-cheese-thumbnail.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/thumbview/cheese-thumbnail.c' object='src/thumbview/cheese-cheese-thumbnail.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-cheese-thumbnail.obj `if test -f 'src/thumbview/cheese-thumbnail.c'; then $(CYGPATH_W) 'src/thumbview/cheese-thumbnail.c'; else $(CYGPATH_W) '$(srcdir)/src/thumbview/cheese-thumbnail.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-cheese-thumbnail.obj `if test -f 'src/thumbview/cheese-thumbnail.c'; then $(CYGPATH_W) 'src/thumbview/cheese-thumbnail.c'; else $(CYGPATH_W) '$(srcdir)/src/thumbview/cheese-thumbnail.c'; fi`
 
 src/thumbview/cheese-eog-thumb-nav.o: src/thumbview/eog-thumb-nav.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/thumbview/cheese-eog-thumb-nav.o -MD -MP -MF src/thumbview/$(DEPDIR)/cheese-eog-thumb-nav.Tpo -c -o src/thumbview/cheese-eog-thumb-nav.o `test -f 'src/thumbview/eog-thumb-nav.c' || echo '$(srcdir)/'`src/thumbview/eog-thumb-nav.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/thumbview/$(DEPDIR)/cheese-eog-thumb-nav.Tpo src/thumbview/$(DEPDIR)/cheese-eog-thumb-nav.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/thumbview/eog-thumb-nav.c' object='src/thumbview/cheese-eog-thumb-nav.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/thumbview/eog-thumb-nav.c' object='src/thumbview/cheese-eog-thumb-nav.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-eog-thumb-nav.o `test -f 'src/thumbview/eog-thumb-nav.c' || echo '$(srcdir)/'`src/thumbview/eog-thumb-nav.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-eog-thumb-nav.o `test -f 'src/thumbview/eog-thumb-nav.c' || echo '$(srcdir)/'`src/thumbview/eog-thumb-nav.c
 
 src/thumbview/cheese-eog-thumb-nav.obj: src/thumbview/eog-thumb-nav.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -MT src/thumbview/cheese-eog-thumb-nav.obj -MD -MP -MF src/thumbview/$(DEPDIR)/cheese-eog-thumb-nav.Tpo -c -o src/thumbview/cheese-eog-thumb-nav.obj `if test -f 'src/thumbview/eog-thumb-nav.c'; then $(CYGPATH_W) 'src/thumbview/eog-thumb-nav.c'; else $(CYGPATH_W) '$(srcdir)/src/thumbview/eog-thumb-nav.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/thumbview/$(DEPDIR)/cheese-eog-thumb-nav.Tpo src/thumbview/$(DEPDIR)/cheese-eog-thumb-nav.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/thumbview/eog-thumb-nav.c' object='src/thumbview/cheese-eog-thumb-nav.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/thumbview/eog-thumb-nav.c' object='src/thumbview/cheese-eog-thumb-nav.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-eog-thumb-nav.obj `if test -f 'src/thumbview/eog-thumb-nav.c'; then $(CYGPATH_W) 'src/thumbview/eog-thumb-nav.c'; else $(CYGPATH_W) '$(srcdir)/src/thumbview/eog-thumb-nav.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cheese_CPPFLAGS) $(CPPFLAGS) $(cheese_CFLAGS) $(CFLAGS) -c -o src/thumbview/cheese-eog-thumb-nav.obj `if test -f 'src/thumbview/eog-thumb-nav.c'; then $(CYGPATH_W) 'src/thumbview/eog-thumb-nav.c'; else $(CYGPATH_W) '$(srcdir)/src/thumbview/eog-thumb-nav.c'; fi`
 
 tests/tests_cheese_test_camera-cheese-test-camera.o: tests/cheese-test-camera.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_camera_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_cheese_test_camera-cheese-test-camera.o -MD -MP -MF tests/$(DEPDIR)/tests_cheese_test_camera-cheese-test-camera.Tpo -c -o tests/tests_cheese_test_camera-cheese-test-camera.o `test -f 'tests/cheese-test-camera.c' || echo '$(srcdir)/'`tests/cheese-test-camera.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_cheese_test_camera-cheese-test-camera.Tpo tests/$(DEPDIR)/tests_cheese_test_camera-cheese-test-camera.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cheese-test-camera.c' object='tests/tests_cheese_test_camera-cheese-test-camera.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/cheese-test-camera.c' object='tests/tests_cheese_test_camera-cheese-test-camera.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_camera_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_camera-cheese-test-camera.o `test -f 'tests/cheese-test-camera.c' || echo '$(srcdir)/'`tests/cheese-test-camera.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_camera_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_camera-cheese-test-camera.o `test -f 'tests/cheese-test-camera.c' || echo '$(srcdir)/'`tests/cheese-test-camera.c
 
 tests/tests_cheese_test_camera-cheese-test-camera.obj: tests/cheese-test-camera.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_camera_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_cheese_test_camera-cheese-test-camera.obj -MD -MP -MF tests/$(DEPDIR)/tests_cheese_test_camera-cheese-test-camera.Tpo -c -o tests/tests_cheese_test_camera-cheese-test-camera.obj `if test -f 'tests/cheese-test-camera.c'; then $(CYGPATH_W) 'tests/cheese-test-camera.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-camera.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_cheese_test_camera-cheese-test-camera.Tpo tests/$(DEPDIR)/tests_cheese_test_camera-cheese-test-camera.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cheese-test-camera.c' object='tests/tests_cheese_test_camera-cheese-test-camera.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/cheese-test-camera.c' object='tests/tests_cheese_test_camera-cheese-test-camera.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_camera_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_camera-cheese-test-camera.obj `if test -f 'tests/cheese-test-camera.c'; then $(CYGPATH_W) 'tests/cheese-test-camera.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-camera.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_camera_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_camera-cheese-test-camera.obj `if test -f 'tests/cheese-test-camera.c'; then $(CYGPATH_W) 'tests/cheese-test-camera.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-camera.c'; fi`
 
 tests/tests_cheese_test_chooser-cheese-test-chooser.o: tests/cheese-test-chooser.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_chooser_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_cheese_test_chooser-cheese-test-chooser.o -MD -MP -MF tests/$(DEPDIR)/tests_cheese_test_chooser-cheese-test-chooser.Tpo -c -o tests/tests_cheese_test_chooser-cheese-test-chooser.o `test -f 'tests/cheese-test-chooser.c' || echo '$(srcdir)/'`tests/cheese-test-chooser.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_cheese_test_chooser-cheese-test-chooser.Tpo tests/$(DEPDIR)/tests_cheese_test_chooser-cheese-test-chooser.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cheese-test-chooser.c' object='tests/tests_cheese_test_chooser-cheese-test-chooser.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/cheese-test-chooser.c' object='tests/tests_cheese_test_chooser-cheese-test-chooser.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_chooser_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_chooser-cheese-test-chooser.o `test -f 'tests/cheese-test-chooser.c' || echo '$(srcdir)/'`tests/cheese-test-chooser.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_chooser_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_chooser-cheese-test-chooser.o `test -f 'tests/cheese-test-chooser.c' || echo '$(srcdir)/'`tests/cheese-test-chooser.c
 
 tests/tests_cheese_test_chooser-cheese-test-chooser.obj: tests/cheese-test-chooser.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_chooser_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_cheese_test_chooser-cheese-test-chooser.obj -MD -MP -MF tests/$(DEPDIR)/tests_cheese_test_chooser-cheese-test-chooser.Tpo -c -o tests/tests_cheese_test_chooser-cheese-test-chooser.obj `if test -f 'tests/cheese-test-chooser.c'; then $(CYGPATH_W) 'tests/cheese-test-chooser.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-chooser.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_cheese_test_chooser-cheese-test-chooser.Tpo tests/$(DEPDIR)/tests_cheese_test_chooser-cheese-test-chooser.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cheese-test-chooser.c' object='tests/tests_cheese_test_chooser-cheese-test-chooser.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/cheese-test-chooser.c' object='tests/tests_cheese_test_chooser-cheese-test-chooser.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_chooser_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_chooser-cheese-test-chooser.obj `if test -f 'tests/cheese-test-chooser.c'; then $(CYGPATH_W) 'tests/cheese-test-chooser.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-chooser.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_chooser_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_chooser-cheese-test-chooser.obj `if test -f 'tests/cheese-test-chooser.c'; then $(CYGPATH_W) 'tests/cheese-test-chooser.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-chooser.c'; fi`
 
 tests/tests_cheese_test_flash-cheese-test-flash.o: tests/cheese-test-flash.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_flash_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_cheese_test_flash-cheese-test-flash.o -MD -MP -MF tests/$(DEPDIR)/tests_cheese_test_flash-cheese-test-flash.Tpo -c -o tests/tests_cheese_test_flash-cheese-test-flash.o `test -f 'tests/cheese-test-flash.c' || echo '$(srcdir)/'`tests/cheese-test-flash.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_cheese_test_flash-cheese-test-flash.Tpo tests/$(DEPDIR)/tests_cheese_test_flash-cheese-test-flash.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cheese-test-flash.c' object='tests/tests_cheese_test_flash-cheese-test-flash.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/cheese-test-flash.c' object='tests/tests_cheese_test_flash-cheese-test-flash.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_flash_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_flash-cheese-test-flash.o `test -f 'tests/cheese-test-flash.c' || echo '$(srcdir)/'`tests/cheese-test-flash.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_flash_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_flash-cheese-test-flash.o `test -f 'tests/cheese-test-flash.c' || echo '$(srcdir)/'`tests/cheese-test-flash.c
 
 tests/tests_cheese_test_flash-cheese-test-flash.obj: tests/cheese-test-flash.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_flash_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_cheese_test_flash-cheese-test-flash.obj -MD -MP -MF tests/$(DEPDIR)/tests_cheese_test_flash-cheese-test-flash.Tpo -c -o tests/tests_cheese_test_flash-cheese-test-flash.obj `if test -f 'tests/cheese-test-flash.c'; then $(CYGPATH_W) 'tests/cheese-test-flash.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-flash.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_cheese_test_flash-cheese-test-flash.Tpo tests/$(DEPDIR)/tests_cheese_test_flash-cheese-test-flash.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cheese-test-flash.c' object='tests/tests_cheese_test_flash-cheese-test-flash.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/cheese-test-flash.c' object='tests/tests_cheese_test_flash-cheese-test-flash.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_flash_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_flash-cheese-test-flash.obj `if test -f 'tests/cheese-test-flash.c'; then $(CYGPATH_W) 'tests/cheese-test-flash.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-flash.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_flash_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_flash-cheese-test-flash.obj `if test -f 'tests/cheese-test-flash.c'; then $(CYGPATH_W) 'tests/cheese-test-flash.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-flash.c'; fi`
 
 tests/tests_cheese_test_monitor-cheese-test-monitor.o: tests/cheese-test-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_cheese_test_monitor-cheese-test-monitor.o -MD -MP -MF tests/$(DEPDIR)/tests_cheese_test_monitor-cheese-test-monitor.Tpo -c -o tests/tests_cheese_test_monitor-cheese-test-monitor.o `test -f 'tests/cheese-test-monitor.c' || echo '$(srcdir)/'`tests/cheese-test-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_cheese_test_monitor-cheese-test-monitor.Tpo tests/$(DEPDIR)/tests_cheese_test_monitor-cheese-test-monitor.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cheese-test-monitor.c' object='tests/tests_cheese_test_monitor-cheese-test-monitor.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/cheese-test-monitor.c' object='tests/tests_cheese_test_monitor-cheese-test-monitor.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_monitor-cheese-test-monitor.o `test -f 'tests/cheese-test-monitor.c' || echo '$(srcdir)/'`tests/cheese-test-monitor.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_monitor-cheese-test-monitor.o `test -f 'tests/cheese-test-monitor.c' || echo '$(srcdir)/'`tests/cheese-test-monitor.c
 
 tests/tests_cheese_test_monitor-cheese-test-monitor.obj: tests/cheese-test-monitor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_cheese_test_monitor-cheese-test-monitor.obj -MD -MP -MF tests/$(DEPDIR)/tests_cheese_test_monitor-cheese-test-monitor.Tpo -c -o tests/tests_cheese_test_monitor-cheese-test-monitor.obj `if test -f 'tests/cheese-test-monitor.c'; then $(CYGPATH_W) 'tests/cheese-test-monitor.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-monitor.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_cheese_test_monitor-cheese-test-monitor.Tpo tests/$(DEPDIR)/tests_cheese_test_monitor-cheese-test-monitor.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cheese-test-monitor.c' object='tests/tests_cheese_test_monitor-cheese-test-monitor.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/cheese-test-monitor.c' object='tests/tests_cheese_test_monitor-cheese-test-monitor.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_monitor-cheese-test-monitor.obj `if test -f 'tests/cheese-test-monitor.c'; then $(CYGPATH_W) 'tests/cheese-test-monitor.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-monitor.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_monitor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_monitor-cheese-test-monitor.obj `if test -f 'tests/cheese-test-monitor.c'; then $(CYGPATH_W) 'tests/cheese-test-monitor.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-monitor.c'; fi`
 
 tests/tests_cheese_test_widget-cheese-test-widget.o: tests/cheese-test-widget.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_widget_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_cheese_test_widget-cheese-test-widget.o -MD -MP -MF tests/$(DEPDIR)/tests_cheese_test_widget-cheese-test-widget.Tpo -c -o tests/tests_cheese_test_widget-cheese-test-widget.o `test -f 'tests/cheese-test-widget.c' || echo '$(srcdir)/'`tests/cheese-test-widget.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_cheese_test_widget-cheese-test-widget.Tpo tests/$(DEPDIR)/tests_cheese_test_widget-cheese-test-widget.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cheese-test-widget.c' object='tests/tests_cheese_test_widget-cheese-test-widget.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/cheese-test-widget.c' object='tests/tests_cheese_test_widget-cheese-test-widget.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_widget_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_widget-cheese-test-widget.o `test -f 'tests/cheese-test-widget.c' || echo '$(srcdir)/'`tests/cheese-test-widget.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_widget_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_widget-cheese-test-widget.o `test -f 'tests/cheese-test-widget.c' || echo '$(srcdir)/'`tests/cheese-test-widget.c
 
 tests/tests_cheese_test_widget-cheese-test-widget.obj: tests/cheese-test-widget.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_widget_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_cheese_test_widget-cheese-test-widget.obj -MD -MP -MF tests/$(DEPDIR)/tests_cheese_test_widget-cheese-test-widget.Tpo -c -o tests/tests_cheese_test_widget-cheese-test-widget.obj `if test -f 'tests/cheese-test-widget.c'; then $(CYGPATH_W) 'tests/cheese-test-widget.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-widget.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_cheese_test_widget-cheese-test-widget.Tpo tests/$(DEPDIR)/tests_cheese_test_widget-cheese-test-widget.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/cheese-test-widget.c' object='tests/tests_cheese_test_widget-cheese-test-widget.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/cheese-test-widget.c' object='tests/tests_cheese_test_widget-cheese-test-widget.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_widget_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_widget-cheese-test-widget.obj `if test -f 'tests/cheese-test-widget.c'; then $(CYGPATH_W) 'tests/cheese-test-widget.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-widget.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_cheese_test_widget_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_cheese_test_widget-cheese-test-widget.obj `if test -f 'tests/cheese-test-widget.c'; then $(CYGPATH_W) 'tests/cheese-test-widget.c'; else $(CYGPATH_W) '$(srcdir)/tests/cheese-test-widget.c'; fi`
 
 tests/tests_test_libcheese-test-libcheese.o: tests/test-libcheese.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_test_libcheese-test-libcheese.o -MD -MP -MF tests/$(DEPDIR)/tests_test_libcheese-test-libcheese.Tpo -c -o tests/tests_test_libcheese-test-libcheese.o `test -f 'tests/test-libcheese.c' || echo '$(srcdir)/'`tests/test-libcheese.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_libcheese-test-libcheese.Tpo tests/$(DEPDIR)/tests_test_libcheese-test-libcheese.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/test-libcheese.c' object='tests/tests_test_libcheese-test-libcheese.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test-libcheese.c' object='tests/tests_test_libcheese-test-libcheese.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_libcheese-test-libcheese.o `test -f 'tests/test-libcheese.c' || echo '$(srcdir)/'`tests/test-libcheese.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_libcheese-test-libcheese.o `test -f 'tests/test-libcheese.c' || echo '$(srcdir)/'`tests/test-libcheese.c
 
 tests/tests_test_libcheese-test-libcheese.obj: tests/test-libcheese.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_test_libcheese-test-libcheese.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_libcheese-test-libcheese.Tpo -c -o tests/tests_test_libcheese-test-libcheese.obj `if test -f 'tests/test-libcheese.c'; then $(CYGPATH_W) 'tests/test-libcheese.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-libcheese.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_libcheese-test-libcheese.Tpo tests/$(DEPDIR)/tests_test_libcheese-test-libcheese.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/test-libcheese.c' object='tests/tests_test_libcheese-test-libcheese.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test-libcheese.c' object='tests/tests_test_libcheese-test-libcheese.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_libcheese-test-libcheese.obj `if test -f 'tests/test-libcheese.c'; then $(CYGPATH_W) 'tests/test-libcheese.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-libcheese.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_libcheese-test-libcheese.obj `if test -f 'tests/test-libcheese.c'; then $(CYGPATH_W) 'tests/test-libcheese.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-libcheese.c'; fi`
 
 libcheese/tests_test_libcheese_gtk-um-crop-area.o: libcheese/um-crop-area.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcheese/tests_test_libcheese_gtk-um-crop-area.o -MD -MP -MF libcheese/$(DEPDIR)/tests_test_libcheese_gtk-um-crop-area.Tpo -c -o libcheese/tests_test_libcheese_gtk-um-crop-area.o `test -f 'libcheese/um-crop-area.c' || echo '$(srcdir)/'`libcheese/um-crop-area.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/tests_test_libcheese_gtk-um-crop-area.Tpo libcheese/$(DEPDIR)/tests_test_libcheese_gtk-um-crop-area.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/um-crop-area.c' object='libcheese/tests_test_libcheese_gtk-um-crop-area.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/um-crop-area.c' object='libcheese/tests_test_libcheese_gtk-um-crop-area.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcheese/tests_test_libcheese_gtk-um-crop-area.o `test -f 'libcheese/um-crop-area.c' || echo '$(srcdir)/'`libcheese/um-crop-area.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcheese/tests_test_libcheese_gtk-um-crop-area.o `test -f 'libcheese/um-crop-area.c' || echo '$(srcdir)/'`libcheese/um-crop-area.c
 
 libcheese/tests_test_libcheese_gtk-um-crop-area.obj: libcheese/um-crop-area.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libcheese/tests_test_libcheese_gtk-um-crop-area.obj -MD -MP -MF libcheese/$(DEPDIR)/tests_test_libcheese_gtk-um-crop-area.Tpo -c -o libcheese/tests_test_libcheese_gtk-um-crop-area.obj `if test -f 'libcheese/um-crop-area.c'; then $(CYGPATH_W) 'libcheese/um-crop-area.c'; else $(CYGPATH_W) '$(srcdir)/libcheese/um-crop-area.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) libcheese/$(DEPDIR)/tests_test_libcheese_gtk-um-crop-area.Tpo libcheese/$(DEPDIR)/tests_test_libcheese_gtk-um-crop-area.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libcheese/um-crop-area.c' object='libcheese/tests_test_libcheese_gtk-um-crop-area.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libcheese/um-crop-area.c' object='libcheese/tests_test_libcheese_gtk-um-crop-area.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcheese/tests_test_libcheese_gtk-um-crop-area.obj `if test -f 'libcheese/um-crop-area.c'; then $(CYGPATH_W) 'libcheese/um-crop-area.c'; else $(CYGPATH_W) '$(srcdir)/libcheese/um-crop-area.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libcheese/tests_test_libcheese_gtk-um-crop-area.obj `if test -f 'libcheese/um-crop-area.c'; then $(CYGPATH_W) 'libcheese/um-crop-area.c'; else $(CYGPATH_W) '$(srcdir)/libcheese/um-crop-area.c'; fi`
 
 tests/tests_test_libcheese_gtk-test-libcheese-gtk.o: tests/test-libcheese-gtk.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_test_libcheese_gtk-test-libcheese-gtk.o -MD -MP -MF tests/$(DEPDIR)/tests_test_libcheese_gtk-test-libcheese-gtk.Tpo -c -o tests/tests_test_libcheese_gtk-test-libcheese-gtk.o `test -f 'tests/test-libcheese-gtk.c' || echo '$(srcdir)/'`tests/test-libcheese-gtk.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_libcheese_gtk-test-libcheese-gtk.Tpo tests/$(DEPDIR)/tests_test_libcheese_gtk-test-libcheese-gtk.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/test-libcheese-gtk.c' object='tests/tests_test_libcheese_gtk-test-libcheese-gtk.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test-libcheese-gtk.c' object='tests/tests_test_libcheese_gtk-test-libcheese-gtk.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_libcheese_gtk-test-libcheese-gtk.o `test -f 'tests/test-libcheese-gtk.c' || echo '$(srcdir)/'`tests/test-libcheese-gtk.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_libcheese_gtk-test-libcheese-gtk.o `test -f 'tests/test-libcheese-gtk.c' || echo '$(srcdir)/'`tests/test-libcheese-gtk.c
 
 tests/tests_test_libcheese_gtk-test-libcheese-gtk.obj: tests/test-libcheese-gtk.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_test_libcheese_gtk-test-libcheese-gtk.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_libcheese_gtk-test-libcheese-gtk.Tpo -c -o tests/tests_test_libcheese_gtk-test-libcheese-gtk.obj `if test -f 'tests/test-libcheese-gtk.c'; then $(CYGPATH_W) 'tests/test-libcheese-gtk.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-libcheese-gtk.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_libcheese_gtk-test-libcheese-gtk.Tpo tests/$(DEPDIR)/tests_test_libcheese_gtk-test-libcheese-gtk.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/test-libcheese-gtk.c' object='tests/tests_test_libcheese_gtk-test-libcheese-gtk.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test-libcheese-gtk.c' object='tests/tests_test_libcheese_gtk-test-libcheese-gtk.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_libcheese_gtk-test-libcheese-gtk.obj `if test -f 'tests/test-libcheese-gtk.c'; then $(CYGPATH_W) 'tests/test-libcheese-gtk.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-libcheese-gtk.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_libcheese_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_libcheese_gtk-test-libcheese-gtk.obj `if test -f 'tests/test-libcheese-gtk.c'; then $(CYGPATH_W) 'tests/test-libcheese-gtk.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-libcheese-gtk.c'; fi`
 
 tests/tests_test_webcam_button-test-webcam-button.o: tests/test-webcam-button.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_webcam_button_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_test_webcam_button-test-webcam-button.o -MD -MP -MF tests/$(DEPDIR)/tests_test_webcam_button-test-webcam-button.Tpo -c -o tests/tests_test_webcam_button-test-webcam-button.o `test -f 'tests/test-webcam-button.c' || echo '$(srcdir)/'`tests/test-webcam-button.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_webcam_button-test-webcam-button.Tpo tests/$(DEPDIR)/tests_test_webcam_button-test-webcam-button.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/test-webcam-button.c' object='tests/tests_test_webcam_button-test-webcam-button.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test-webcam-button.c' object='tests/tests_test_webcam_button-test-webcam-button.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_webcam_button_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_webcam_button-test-webcam-button.o `test -f 'tests/test-webcam-button.c' || echo '$(srcdir)/'`tests/test-webcam-button.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_webcam_button_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_webcam_button-test-webcam-button.o `test -f 'tests/test-webcam-button.c' || echo '$(srcdir)/'`tests/test-webcam-button.c
 
 tests/tests_test_webcam_button-test-webcam-button.obj: tests/test-webcam-button.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_webcam_button_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_test_webcam_button-test-webcam-button.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_webcam_button-test-webcam-button.Tpo -c -o tests/tests_test_webcam_button-test-webcam-button.obj `if test -f 'tests/test-webcam-button.c'; then $(CYGPATH_W) 'tests/test-webcam-button.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-webcam-button.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_webcam_button-test-webcam-button.Tpo tests/$(DEPDIR)/tests_test_webcam_button-test-webcam-button.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/test-webcam-button.c' object='tests/tests_test_webcam_button-test-webcam-button.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test-webcam-button.c' object='tests/tests_test_webcam_button-test-webcam-button.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_webcam_button_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_webcam_button-test-webcam-button.obj `if test -f 'tests/test-webcam-button.c'; then $(CYGPATH_W) 'tests/test-webcam-button.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-webcam-button.c'; fi`
-$(srcdir)/tests_cheese_test_widget_vala.stamp: $(tests_cheese_test_widget_SOURCES)
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_cheese_test_widget_SOURCES)
-	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/tests_test_webcam_button_vala.stamp: $(tests_test_webcam_button_SOURCES)
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_test_webcam_button_SOURCES)
-	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/tests_cheese_test_flash_vala.stamp: $(tests_cheese_test_flash_SOURCES)
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_cheese_test_flash_SOURCES)
-	$(AM_V_at)mv -f $@-t $@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_webcam_button_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tests/tests_test_webcam_button-test-webcam-button.obj `if test -f 'tests/test-webcam-button.c'; then $(CYGPATH_W) 'tests/test-webcam-button.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-webcam-button.c'; fi`
+tests_cheese_test_widget_vala.stamp: $(tests_cheese_test_widget_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_cheese_test_widget_SOURCES)
+	$(AM_V_at)touch $@
+tests_test_webcam_button_vala.stamp: $(tests_test_webcam_button_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_test_webcam_button_SOURCES)
+	$(AM_V_at)touch $@
+tests_cheese_test_flash_vala.stamp: $(tests_cheese_test_flash_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_cheese_test_flash_SOURCES)
+	$(AM_V_at)touch $@
 $(srcdir)/src/cheese-countdown.c: $(srcdir)/cheese_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/cheese_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/cheese_vala.stamp; \
+	  rm -f $(srcdir)/cheese_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) cheese_vala.stamp; \
 	fi
 $(srcdir)/src/cheese-effects-manager.c: $(srcdir)/cheese_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/cheese_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/cheese_vala.stamp; \
+	  rm -f $(srcdir)/cheese_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) cheese_vala.stamp; \
 	fi
 $(srcdir)/src/cheese-preferences.c: $(srcdir)/cheese_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/cheese_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/cheese_vala.stamp; \
+	  rm -f $(srcdir)/cheese_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) cheese_vala.stamp; \
 	fi
 $(srcdir)/src/cheese-window.c: $(srcdir)/cheese_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/cheese_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/cheese_vala.stamp; \
+	  rm -f $(srcdir)/cheese_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) cheese_vala.stamp; \
 	fi
 $(srcdir)/src/cheese-main.c: $(srcdir)/cheese_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/cheese_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/cheese_vala.stamp; \
+	  rm -f $(srcdir)/cheese_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) cheese_vala.stamp; \
 	fi
 $(srcdir)/src/cheese-shareable-media.c: $(srcdir)/cheese_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/cheese_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/cheese_vala.stamp; \
+	  rm -f $(srcdir)/cheese_vala.stamp; \
+	  $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) cheese_vala.stamp; \
 	fi
-$(srcdir)/cheese_vala.stamp: $(cheese_SOURCES)
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(cheese_SOURCES)
-	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/tests_test_libcheese_vala.stamp: $(tests_test_libcheese_SOURCES)
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_test_libcheese_SOURCES)
-	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/tests_cheese_test_monitor_vala.stamp: $(tests_cheese_test_monitor_SOURCES)
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_cheese_test_monitor_SOURCES)
-	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/tests_cheese_test_camera_vala.stamp: $(tests_cheese_test_camera_SOURCES)
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_cheese_test_camera_SOURCES)
-	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/tests_cheese_test_chooser_vala.stamp: $(tests_cheese_test_chooser_SOURCES)
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_cheese_test_chooser_SOURCES)
-	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/tests_test_libcheese_gtk_vala.stamp: $(tests_test_libcheese_gtk_SOURCES)
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_test_libcheese_gtk_SOURCES)
-	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/libcheese_gtk_la_vala.stamp: $(libcheese_gtk_la_SOURCES)
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libcheese_gtk_la_SOURCES)
-	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/libcheese_la_vala.stamp: $(libcheese_la_SOURCES)
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libcheese_la_SOURCES)
-	$(AM_V_at)mv -f $@-t $@
+cheese_vala.stamp: $(cheese_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(cheese_SOURCES)
+	$(AM_V_at)touch $@
+tests_test_libcheese_vala.stamp: $(tests_test_libcheese_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_test_libcheese_SOURCES)
+	$(AM_V_at)touch $@
+tests_cheese_test_monitor_vala.stamp: $(tests_cheese_test_monitor_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_cheese_test_monitor_SOURCES)
+	$(AM_V_at)touch $@
+tests_cheese_test_camera_vala.stamp: $(tests_cheese_test_camera_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_cheese_test_camera_SOURCES)
+	$(AM_V_at)touch $@
+tests_cheese_test_chooser_vala.stamp: $(tests_cheese_test_chooser_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_cheese_test_chooser_SOURCES)
+	$(AM_V_at)touch $@
+tests_test_libcheese_gtk_vala.stamp: $(tests_test_libcheese_gtk_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(tests_test_libcheese_gtk_SOURCES)
+	$(AM_V_at)touch $@
+libcheese_gtk_la_vala.stamp: $(libcheese_gtk_la_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libcheese_gtk_la_SOURCES)
+	$(AM_V_at)touch $@
+libcheese_la_vala.stamp: $(libcheese_la_SOURCES)
+	$(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libcheese_la_SOURCES)
+	$(AM_V_at)touch $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1752,7 +1786,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
 install-dist_actionsicon16DATA: $(dist_actionsicon16_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(actionsicon16dir)" || $(MKDIR_P) "$(DESTDIR)$(actionsicon16dir)"
@@ -1770,7 +1806,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_actionsicon16_DATA)'; test -n "$(actionsicon16dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(actionsicon16dir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(actionsicon16dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(actionsicon16dir)" && rm -f $$files
 install-dist_actionsicon22DATA: $(dist_actionsicon22_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(actionsicon22dir)" || $(MKDIR_P) "$(DESTDIR)$(actionsicon22dir)"
@@ -1788,7 +1826,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_actionsicon22_DATA)'; test -n "$(actionsicon22dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(actionsicon22dir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(actionsicon22dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(actionsicon22dir)" && rm -f $$files
 install-dist_actionsicon24DATA: $(dist_actionsicon24_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(actionsicon24dir)" || $(MKDIR_P) "$(DESTDIR)$(actionsicon24dir)"
@@ -1806,7 +1846,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_actionsicon24_DATA)'; test -n "$(actionsicon24dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(actionsicon24dir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(actionsicon24dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(actionsicon24dir)" && rm -f $$files
 install-dist_actionsicon32DATA: $(dist_actionsicon32_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(actionsicon32dir)" || $(MKDIR_P) "$(DESTDIR)$(actionsicon32dir)"
@@ -1824,7 +1866,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_actionsicon32_DATA)'; test -n "$(actionsicon32dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(actionsicon32dir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(actionsicon32dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(actionsicon32dir)" && rm -f $$files
 install-dist_actionsicon48DATA: $(dist_actionsicon48_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(actionsicon48dir)" || $(MKDIR_P) "$(DESTDIR)$(actionsicon48dir)"
@@ -1842,7 +1886,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_actionsicon48_DATA)'; test -n "$(actionsicon48dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(actionsicon48dir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(actionsicon48dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(actionsicon48dir)" && rm -f $$files
 install-dist_actionsiconscalableDATA: $(dist_actionsiconscalable_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(actionsiconscalabledir)" || $(MKDIR_P) "$(DESTDIR)$(actionsiconscalabledir)"
@@ -1860,7 +1906,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_actionsiconscalable_DATA)'; test -n "$(actionsiconscalabledir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(actionsiconscalabledir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(actionsiconscalabledir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(actionsiconscalabledir)" && rm -f $$files
 install-dist_appsicon16DATA: $(dist_appsicon16_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(appsicon16dir)" || $(MKDIR_P) "$(DESTDIR)$(appsicon16dir)"
@@ -1878,7 +1926,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_appsicon16_DATA)'; test -n "$(appsicon16dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(appsicon16dir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(appsicon16dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(appsicon16dir)" && rm -f $$files
 install-dist_appsicon22DATA: $(dist_appsicon22_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(appsicon22dir)" || $(MKDIR_P) "$(DESTDIR)$(appsicon22dir)"
@@ -1896,7 +1946,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_appsicon22_DATA)'; test -n "$(appsicon22dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(appsicon22dir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(appsicon22dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(appsicon22dir)" && rm -f $$files
 install-dist_appsicon24DATA: $(dist_appsicon24_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(appsicon24dir)" || $(MKDIR_P) "$(DESTDIR)$(appsicon24dir)"
@@ -1914,7 +1966,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_appsicon24_DATA)'; test -n "$(appsicon24dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(appsicon24dir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(appsicon24dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(appsicon24dir)" && rm -f $$files
 install-dist_appsicon256DATA: $(dist_appsicon256_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(appsicon256dir)" || $(MKDIR_P) "$(DESTDIR)$(appsicon256dir)"
@@ -1932,7 +1986,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_appsicon256_DATA)'; test -n "$(appsicon256dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(appsicon256dir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(appsicon256dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(appsicon256dir)" && rm -f $$files
 install-dist_appsicon32DATA: $(dist_appsicon32_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(appsicon32dir)" || $(MKDIR_P) "$(DESTDIR)$(appsicon32dir)"
@@ -1950,7 +2006,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_appsicon32_DATA)'; test -n "$(appsicon32dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(appsicon32dir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(appsicon32dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(appsicon32dir)" && rm -f $$files
 install-dist_appsicon48DATA: $(dist_appsicon48_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(appsicon48dir)" || $(MKDIR_P) "$(DESTDIR)$(appsicon48dir)"
@@ -1968,7 +2026,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_appsicon48_DATA)'; test -n "$(appsicon48dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(appsicon48dir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(appsicon48dir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(appsicon48dir)" && rm -f $$files
 install-dist_catalogDATA: $(dist_catalog_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(catalogdir)" || $(MKDIR_P) "$(DESTDIR)$(catalogdir)"
@@ -1986,7 +2046,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_catalog_DATA)'; test -n "$(catalogdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(catalogdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(catalogdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(catalogdir)" && rm -f $$files
 install-dist_pixmapsDATA: $(dist_pixmaps_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pixmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)"
@@ -2004,7 +2066,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pixmapsdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pixmapsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pixmapsdir)" && rm -f $$files
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
@@ -2022,7 +2086,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
 install-girDATA: $(gir_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
@@ -2040,7 +2106,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(girdir)" && rm -f $$files
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@@ -2058,7 +2126,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
 install-typelibDATA: $(typelib_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)"
@@ -2076,7 +2146,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(typelibdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(typelibdir)" && rm -f $$files
 install-cheeseHEADERS: $(cheese_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(cheesedir)" || $(MKDIR_P) "$(DESTDIR)$(cheesedir)"
@@ -2094,7 +2166,9 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(cheese_HEADERS)'; test -n "$(cheesedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(cheesedir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(cheesedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(cheesedir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -2306,18 +2380,14 @@
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 dist-lzma: distdir
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -2334,7 +2404,7 @@
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -2348,8 +2418,6 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -2369,7 +2437,6 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -2398,16 +2465,8 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -2446,15 +2505,10 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -2603,14 +2657,14 @@
 	clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
 	clean-libLTLIBRARIES clean-libtool clean-local \
 	clean-noinstPROGRAMS ctags ctags-recursive dist dist-all \
-	dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \
-	dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-libtool distclean-local distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-cheeseHEADERS install-data install-data-am \
-	install-data-hook install-data-local install-desktopDATA \
+	dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-compile \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-local distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-cheeseHEADERS \
+	install-data install-data-am install-data-hook \
+	install-data-local install-desktopDATA \
 	install-dist_actionsicon16DATA install-dist_actionsicon22DATA \
 	install-dist_actionsicon24DATA install-dist_actionsicon32DATA \
 	install-dist_actionsicon48DATA \
diff -Nru cheese-3.5.4/NEWS cheese-3.5.5/NEWS
--- cheese-3.5.4/NEWS	2012-07-16 20:05:03.000000000 +0000
+++ cheese-3.5.5/NEWS	2012-08-06 21:30:19.000000000 +0000
@@ -1,6 +1,29 @@
 ChangeLog for Cheese
 --------------------
 
+version 3.5.5
+  - Fix zh_CN translation markup
+  - Set G_LOG_DOMAIN for libcheese and libcheese-gtk
+    Define the logging domain for the GLib logging system, so that messages
+    are prefixed with the name of the library.
+  - Fix missing translation for a string
+    https://bugzilla.gnome.org/show_bug.cgi?id=680756
+  - Post-release bump to version 3.5.5
+  - Added/Updated Translations
+    - as, courtesy of Nilamdyuti Goswami
+    - de, courtesy of Tobias Endrigkeit
+    - el, courtesy of Tom Tryfonidis
+    - es, courtesy of Daniel Mustieles
+    - gl, courtesy of Fran Dieguez
+    - gu, courtesy of "Last-Translator: \n"
+    - ja, courtesy of Jiro Matsuzawa
+    - sl, courtesy of Matej Urbančič
+    - zh_CN, courtesy of Wylmer Wang
+    - zh_HK, courtesy of Chao-Hsiung Liao
+    - zh_TW, courtesy of Chao-Hsiung Liao
+  - Added/Updated Documentation
+    - zh_CN, courtesy of Wylmer Wang
+
 version 3.5.4
   - Require Clutter 1.10.0 for aspect frame changes
   - help: fixed broken links in Mallard docs
diff -Nru cheese-3.5.4/po/as.po cheese-3.5.5/po/as.po
--- cheese-3.5.4/po/as.po	2012-07-16 19:56:57.000000000 +0000
+++ cheese-3.5.5/po/as.po	2012-08-04 13:59:36.000000000 +0000
@@ -8,10 +8,11 @@
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=cheese&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-06-25 21:41+0000\n"
-"PO-Revision-Date: 2012-07-06 13:24+0530\n"
+"POT-Creation-Date: 2012-07-29 09:59+0000\n"
+"PO-Revision-Date: 2012-08-03 14:32+0530\n"
 "Last-Translator: Nilamdyuti Goswami \n"
 "Language-Team: as_IN \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -347,6 +348,10 @@
 msgid "Shutter sound"
 msgstr "ষাটাৰ শব্দ"
 
+#: ../libcheese/cheese-avatar-chooser.c:260
+msgid "Select"
+msgstr "বাছক"
+
 #: ../libcheese/cheese-avatar-chooser.c:281
 msgid "_Take a photo"
 msgstr "এটা ফ'টো লওক (_T)"
@@ -417,7 +422,6 @@
 msgstr "সমপূৰ্ণ পৰ্দা অৱস্থাত আৰম্ভ কৰক"
 
 #: ../src/cheese-main.vala:92
-#| msgid "_Photo"
 msgid "_Shoot"
 msgstr "লওক (_S)"
 
@@ -438,12 +442,10 @@
 msgstr "বাৰ্স্ট (_B)"
 
 #: ../src/cheese-main.vala:102
-#| msgid "Fullscreen"
 msgid "_Fullscreen"
 msgstr "সম্পূৰ্ণপৰ্দা (_F)"
 
 #: ../src/cheese-main.vala:110
-#| msgid "Preferences"
 msgid "P_references"
 msgstr "পছন্দসমূহ (_r)"
 
@@ -525,7 +527,6 @@
 msgstr "ৰেকৰ্ডিং বন্ধ কৰক"
 
 #: ../src/cheese-window.vala:934 ../src/cheese-window.vala:1508
-#| msgid "_Record a Video"
 msgid "Record a Video"
 msgstr "এটা ভিডিঅ' ৰেকৰ্ড কৰক"
 
@@ -543,7 +544,6 @@
 msgstr "ফ'টো লোৱা বন্ধ কৰক"
 
 #: ../src/cheese-window.vala:994
-#| msgid "Take _Multiple Photos"
 msgid "Take Multiple Photos"
 msgstr "একাধিক ফ'টো লওক"
 
@@ -556,7 +556,6 @@
 msgstr "কোনো প্ৰভাৱ পোৱা নগল"
 
 #: ../src/cheese-window.vala:1503
-#| msgid "_Take a Photo"
 msgid "Take a Photo"
 msgstr "এটা ফ'টো লওক"
 
diff -Nru cheese-3.5.4/po/de.po cheese-3.5.5/po/de.po
--- cheese-3.5.4/po/de.po	2012-03-12 16:10:53.000000000 +0000
+++ cheese-3.5.5/po/de.po	2012-07-27 15:25:33.000000000 +0000
@@ -3,133 +3,54 @@
 # This file is distributed under the same license as the cheese package.
 # Daniel G. Siegel , 2007.
 # Andre Klapper , 2007.
-# Wolfgang Stöggl , 2008 - 2011.
+# Wolfgang Stöggl , 2008-2012.
 # Hendrik Richter , 2008, 2009.
 # Mario Blättermann , 2009-2011.
 # Paul Seyfert , 2010-2012.
+# Tobias Endrigkeit , 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: cheese master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=cheese&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-03 16:26+0000\n"
-"PO-Revision-Date: 2012-03-04 16:29+0100\n"
-"Last-Translator: Mario Blättermann \n"
-"Language-Team: German \n"
+"POT-Creation-Date: 2012-07-18 04:16+0000\n"
+"PO-Revision-Date: 2012-07-21 12:23+0200\n"
+"Last-Translator: Tobias Endrigkeit \n"
+"Language-Team: Deutsch \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: German\n"
-
-#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:3
-msgid "Take photos and videos with your webcam, with fun graphical effects"
-msgstr ""
-"Ein Programm, um Bilder und Videos mit einer Webcam aufzunehmen und lustige "
-"graphische Effekte hinzuzufügen"
-
-#: ../data/cheese-about.ui.h:2
-msgid "Cheese Website"
-msgstr "Cheese-Website"
-
-#: ../data/cheese-about.ui.h:3
-msgid "translator-credits"
-msgstr ""
-"Daniel G. Siegel \n"
-"Andre Klapper \n"
-"Wolfgang Stöggl \n"
-"Nathan-J. Hirschauer \n"
-"Mario Blättermann \n"
-"Paul Seyfert "
+"X-Generator: Gtranslator 2.91.5\n"
 
 #: ../data/cheese-actions.ui.h:1
-msgid "_Cheese"
-msgstr "_Cheese"
-
-#: ../data/cheese-actions.ui.h:2
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
-#: ../data/cheese-actions.ui.h:3
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: ../data/cheese-actions.ui.h:4
-msgid "_Contents"
-msgstr "I_nhalt"
-
-#: ../data/cheese-actions.ui.h:5
-msgid "_About"
-msgstr "_Info"
-
-#: ../data/cheese-actions.ui.h:6
 msgid "Share…"
 msgstr "Freigeben …"
 
-#: ../data/cheese-actions.ui.h:7
+#: ../data/cheese-actions.ui.h:2
 msgid "Save _As…"
 msgstr "Speichern _unter …"
 
-#: ../data/cheese-actions.ui.h:8
+#: ../data/cheese-actions.ui.h:3
 msgid "Move to _Trash"
 msgstr "In den Mülleimer _verschieben"
 
-#: ../data/cheese-actions.ui.h:9
+#: ../data/cheese-actions.ui.h:4
 msgid "Move _All to Trash"
 msgstr "_Alle in den Mülleimer verschieben"
 
-#: ../data/cheese-actions.ui.h:10
+#: ../data/cheese-actions.ui.h:5
 msgid "_Wide Mode"
 msgstr "_Breitbildmodus"
 
-#: ../data/cheese-actions.ui.h:11 ../data/cheese-main-window.ui.h:5
-msgid "_Take a Photo"
-msgstr "Foto _aufnehmen"
-
-#: ../data/cheese-actions.ui.h:12 ../data/cheese-main-window.ui.h:4
-#: ../libcheese/cheese-avatar-chooser.c:263
-msgid "Take a photo"
-msgstr "Foto aufnehmen"
-
-#: ../data/cheese-actions.ui.h:13
-msgid "_Record a Video"
-msgstr "_Video aufnehmen"
-
-#: ../data/cheese-actions.ui.h:14
-msgid "Record a video"
-msgstr "Video aufnehmen"
-
-#: ../data/cheese-actions.ui.h:15
-msgid "Take _Multiple Photos"
-msgstr "_Mehrere Fotos aufnehmen"
-
-#: ../data/cheese-actions.ui.h:16
-msgid "Take multiple photos"
-msgstr "Mehrere Fotos aufnehmen"
-
-#: ../data/cheese-actions.ui.h:17
-msgid "_Photo"
-msgstr "_Foto"
-
-#: ../data/cheese-actions.ui.h:18
-msgid "_Video"
-msgstr "V_ideo"
-
-#: ../data/cheese-actions.ui.h:19
-msgid "_Burst"
-msgstr "_Serienaufnahme"
-
-#: ../data/cheese-actions.ui.h:20 ../data/cheese-main-window.ui.h:8
-msgid "_Effects"
-msgstr "_Effekte"
-
-#: ../data/cheese-actions.ui.h:21
+#: ../data/cheese-actions.ui.h:6
 msgid "P_revious Effects"
 msgstr "Vo_rige Effekte"
 
-#: ../data/cheese-actions.ui.h:22
+#: ../data/cheese-actions.ui.h:7
 msgid "Ne_xt Effects"
 msgstr "Nä_chste Effekte"
 
@@ -145,6 +66,15 @@
 msgid "Photo burst mode"
 msgstr "Serienaufnahmemodus"
 
+#: ../data/cheese-main-window.ui.h:4 ../libcheese/cheese-avatar-chooser.c:263
+#: ../src/cheese-window.vala:1504
+msgid "Take a photo"
+msgstr "Foto aufnehmen"
+
+#: ../data/cheese-main-window.ui.h:5
+msgid "_Take a Photo"
+msgstr "Foto _aufnehmen"
+
 # Effekt
 #: ../data/cheese-main-window.ui.h:6
 msgid "Previous"
@@ -154,6 +84,10 @@
 msgid "Effects"
 msgstr "Effekte"
 
+#: ../data/cheese-main-window.ui.h:8 ../src/cheese-main.vala:107
+msgid "_Effects"
+msgstr "_Effekte"
+
 # Effekt
 #: ../data/cheese-main-window.ui.h:9
 msgid "Next"
@@ -208,8 +142,8 @@
 msgstr "Bild"
 
 #: ../data/cheese-prefs.ui.h:11
-msgid "Shutter"
-msgstr "Verschluss"
+msgid "Shutter"
+msgstr "Verschluss"
 
 #: ../data/cheese-prefs.ui.h:12
 msgid "_Countdown"
@@ -235,7 +169,8 @@
 msgid "Capture"
 msgstr "Aufnahme"
 
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese-main.vala:67
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese-main.vala:81
+#: ../src/cheese-main.vala:489
 msgid "Cheese"
 msgstr "Cheese"
 
@@ -243,36 +178,43 @@
 msgid "Cheese Webcam Booth"
 msgstr "Cheese Webcam-Automat"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:1
+#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-main.vala:484
+msgid "Take photos and videos with your webcam, with fun graphical effects"
+msgstr ""
+"Ein Programm, um Bilder und Videos mit einer Webcam aufzunehmen und lustige "
+"graphische Effekte hinzuzufügen"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:1
 msgid "Use a countdown"
 msgstr "Countdown verwenden"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:2
+#: ../data/org.gnome.Cheese.gschema.xml.h:2
 msgid "Set to true to show a countdown before taking a photo"
-msgstr "Auf »wahr« setzen, um vor der Aufnahme eines Bildes rückwärts zu zählen"
+msgstr ""
+"Auf »wahr« setzen, um vor der Aufnahme eines Bildes rückwärts zu zählen"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:3
+#: ../data/org.gnome.Cheese.gschema.xml.h:3
 msgid "Countdown length"
 msgstr "Countdown-Länge"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:4
+#: ../data/org.gnome.Cheese.gschema.xml.h:4
 msgid "The duration of the countdown before taking a photo, in seconds"
 msgstr "Die Dauer des Countdowns vor der Aufnahme eines Fotos in Sekunden"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:5
+#: ../data/org.gnome.Cheese.gschema.xml.h:5
 msgid "Fire flash before taking a picture"
 msgstr "Blitz vor der Aufnahme"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:6
+#: ../data/org.gnome.Cheese.gschema.xml.h:6
 msgid "Set to true to fire a flash when taking a picture"
 msgstr ""
 "Auf »wahr« setzen, um bei der Aufnahme eines Bildes einen Blitz auszulösen"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:7
+#: ../data/org.gnome.Cheese.gschema.xml.h:7
 msgid "Camera device string indicator"
 msgstr "Zeichenkette zur Bezeichnung des Kameragerätes"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:8
+#: ../data/org.gnome.Cheese.gschema.xml.h:8
 msgid ""
 "The path to the device node which points to the camera, for example /dev/"
 "video0"
@@ -280,83 +222,83 @@
 "Der Pfad zum Geräteknoten, der auf die Kamera verweist, zum Beispiel /dev/"
 "video0"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:9
+#: ../data/org.gnome.Cheese.gschema.xml.h:9
 msgid "Last selected effect"
 msgstr "Zuletzt ausgewählter Effekt"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:10
+#: ../data/org.gnome.Cheese.gschema.xml.h:10
 msgid "Name of the installed effect that was selected last"
 msgstr "Name des installierten Effekts, der zuletzt ausgewählt wurde"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:11
+#: ../data/org.gnome.Cheese.gschema.xml.h:11
 msgid "Photo width"
 msgstr "Foto-Breite"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:12
+#: ../data/org.gnome.Cheese.gschema.xml.h:12
 msgid "The width of the image captured from the camera, in pixels"
 msgstr "Die Breite des von der Kamera aufgenommenen Bildes in Pixel"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:13
+#: ../data/org.gnome.Cheese.gschema.xml.h:13
 msgid "Photo height"
 msgstr "Foto-Höhe"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:14
+#: ../data/org.gnome.Cheese.gschema.xml.h:14
 msgid "The height of the image captured from the camera, in pixels"
 msgstr "Die Höhe des von der Kamera aufgenommenen Bildes in Pixel"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:15
+#: ../data/org.gnome.Cheese.gschema.xml.h:15
 msgid "Video width"
 msgstr "Video-Breite"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:16
+#: ../data/org.gnome.Cheese.gschema.xml.h:16
 msgid "The width of the video captured from the camera, in pixels"
 msgstr "Die Breite des von der Kamera aufgenommenen Videos in Pixel"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:17
+#: ../data/org.gnome.Cheese.gschema.xml.h:17
 msgid "Video height"
 msgstr "Video-Höhe"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:18
+#: ../data/org.gnome.Cheese.gschema.xml.h:18
 msgid "The height of the video captured from the camera, in pixels"
 msgstr "Die Höhe des von der Kamera aufgenommenen Videos in Pixel"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:19
+#: ../data/org.gnome.Cheese.gschema.xml.h:19
 msgid "Picture brightness"
 msgstr "Bildhelligkeit"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:20
+#: ../data/org.gnome.Cheese.gschema.xml.h:20
 msgid "Adjusts the brightness of the picture coming from the camera"
 msgstr "Passt die Helligkeit des von der Kamera kommenden Bildes an"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:21
+#: ../data/org.gnome.Cheese.gschema.xml.h:21
 msgid "Picture contrast"
 msgstr "Bildkontrast"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:22
+#: ../data/org.gnome.Cheese.gschema.xml.h:22
 msgid "Adjusts the contrast of the picture coming from the camera"
 msgstr "Passt den Kontrast des von der Kamera kommenden Bildes an"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:23
+#: ../data/org.gnome.Cheese.gschema.xml.h:23
 msgid "Picture saturation"
 msgstr "Bildsättigung"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:24
+#: ../data/org.gnome.Cheese.gschema.xml.h:24
 msgid "Adjusts the saturation of the picture coming from the camera"
 msgstr "Passt die Sättigung des von der Kamera kommenden Bildes an"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:25
+#: ../data/org.gnome.Cheese.gschema.xml.h:25
 msgid "Picture hue"
 msgstr "Bildfarbton"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:26
+#: ../data/org.gnome.Cheese.gschema.xml.h:26
 msgid "Adjusts the hue (color tint) of the picture coming from the camera"
 msgstr "Passt den Farbton des von der Kamera kommenden Bildes an"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:27
+#: ../data/org.gnome.Cheese.gschema.xml.h:27
 msgid "Video Path"
 msgstr "Video-Pfad"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:28
+#: ../data/org.gnome.Cheese.gschema.xml.h:28
 msgid ""
 "Defines the path where the videos are stored. If empty, \"XDG_VIDEO/Webcam\" "
 "will be used."
@@ -364,11 +306,11 @@
 "Legt den Pfad fest, wo die Videos gespeichert werden. Falls leer, wird "
 "»XDG_VIDEO/Webcam« stattdessen verwendet."
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:29
+#: ../data/org.gnome.Cheese.gschema.xml.h:29
 msgid "Photo Path"
 msgstr "Foto-Pfad"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:30
+#: ../data/org.gnome.Cheese.gschema.xml.h:30
 msgid ""
 "Defines the path where the photos are stored. If empty, \"XDG_PHOTO/Webcam\" "
 "will be used."
@@ -376,11 +318,11 @@
 "Legt den Pfad fest, wo die Fotos gespeichert werden. Falls leer, wird "
 "»XDG_PHOTO/Webcam« stattdessen verwendet."
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:31
+#: ../data/org.gnome.Cheese.gschema.xml.h:31
 msgid "Whether to start in wide mode"
 msgstr "Im breiten Modus starten"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:32
+#: ../data/org.gnome.Cheese.gschema.xml.h:32
 msgid ""
 "If set to true, Cheese will start up in wide mode, with the image collection "
 "placed on the right-hand side. Useful with small screens."
@@ -389,19 +331,19 @@
 "Bildersammlung auf der rechten Seite. Dies ist bei kleinen Bildschirmen "
 "sinnvoll."
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:33
+#: ../data/org.gnome.Cheese.gschema.xml.h:33
 msgid "Whether to start in fullscreen"
 msgstr "Im Vollbildmodus starten"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:34
+#: ../data/org.gnome.Cheese.gschema.xml.h:34
 msgid "If set to true, Cheese will start up in fullscreen mode."
 msgstr "Falls auf »wahr« gesetzt, startet Cheese im Vollbildmodus."
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:35
+#: ../data/org.gnome.Cheese.gschema.xml.h:35
 msgid "Time between photos in burst mode"
 msgstr "Verzögerung zwischen den Fotos im Serienaufnahmemodus"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:36
+#: ../data/org.gnome.Cheese.gschema.xml.h:36
 msgid ""
 "The length of time, in milliseconds, to delay between taking each photo in a "
 "burst sequence of photos. If the burst delay is less than the countdown "
@@ -411,15 +353,15 @@
 "Serienaufnahmemodus. Falls das Verzögerungsintervall kleiner ist als die "
 "Dauer des Countdowns, wird stattdessen die Dauer des Countdowns verwendet."
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:37
+#: ../data/org.gnome.Cheese.gschema.xml.h:37
 msgid "Number of photos in burst mode"
 msgstr "Anzahl der Fotos im Serienaufnahmemodus"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:38
+#: ../data/org.gnome.Cheese.gschema.xml.h:38
 msgid "The number of photos to take in a single burst."
 msgstr "Die Anzahl der Fotos in jedem Ablauf einer Serienaufnahme."
 
-#: ../libcheese/cheese-avatar-chooser.c:138 ../src/cheese-window.vala:918
+#: ../libcheese/cheese-avatar-chooser.c:138 ../src/cheese-window.vala:807
 msgid "Shutter sound"
 msgstr "Verschlussgeräusch"
 
@@ -450,67 +392,132 @@
 msgid "Cancellable initialization not supported"
 msgstr "Abbrechbare Initialisierung wird nicht unterstützt"
 
-#: ../libcheese/cheese-camera.c:1489
+#: ../libcheese/cheese-camera.c:430 ../libcheese/cheese-camera.c:1549
+msgid "One or more needed GStreamer elements are missing: "
+msgstr "Ein oder mehrere GStreamer-Elemente fehlen: "
+
+#: ../libcheese/cheese-camera.c:1509
 #, c-format
 msgid "No device found"
 msgstr "Kein Gerät gefunden"
 
-#: ../libcheese/cheese-camera.c:1539
-msgid "One or more needed GStreamer elements are missing: "
-msgstr "Ein oder mehrere GStreamer-Elemente fehlen: "
+#. Translators: This is a time format, like "09:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../libcheese/cheese-camera.c:1786
+#, c-format
+msgctxt "time format"
+msgid "%02i:%02i:%02i"
+msgstr "%02i:%02i:%02i"
 
 #: ../src/cheese-effects-manager.vala:50
 msgid "No Effect"
 msgstr "Kein Effekt"
 
-#: ../src/cheese-main.vala:37
+#: ../src/cheese-main.vala:51
 msgid "Start in wide mode"
 msgstr "Im breiten Modus starten"
 
-#: ../src/cheese-main.vala:38
+#: ../src/cheese-main.vala:52
 msgid "Device to use as a camera"
 msgstr "Gerät welches als Kamera benutzt werden soll"
 
-#: ../src/cheese-main.vala:38
+#: ../src/cheese-main.vala:52
 msgid "DEVICE"
 msgstr "GERÄT"
 
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:53
 msgid "Output version information and exit"
 msgstr "Versionsinformationen anzeigen und beenden"
 
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:54
 msgid "Start in fullscreen mode"
 msgstr "Im Vollbildmodus starten"
 
-#: ../src/cheese-main.vala:126
+#: ../src/cheese-main.vala:92
+msgid "_Shoot"
+msgstr "_Aufnahme"
+
+#: ../src/cheese-main.vala:96
+msgid "Mode:"
+msgstr "Modus:"
+
+#: ../src/cheese-main.vala:97
+msgid "_Photo"
+msgstr "_Foto"
+
+#: ../src/cheese-main.vala:98
+msgid "_Video"
+msgstr "V_ideo"
+
+#: ../src/cheese-main.vala:99
+msgid "_Burst"
+msgstr "_Serienaufnahme"
+
+#: ../src/cheese-main.vala:102
+msgid "_Fullscreen"
+msgstr "_Vollbild"
+
+#: ../src/cheese-main.vala:110
+msgid "P_references"
+msgstr "Ei_nstellungen"
+
+#: ../src/cheese-main.vala:113
+msgid "_About"
+msgstr "_Info"
+
+#: ../src/cheese-main.vala:114
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../src/cheese-main.vala:117
+msgid "_Quit"
+msgstr "_Beenden"
+
+#: ../src/cheese-main.vala:177
 msgid "- Take photos and videos from your webcam"
 msgstr "Ein Programm, um Bilder und Videos mit einer Webcam aufzunehmen"
 
-#: ../src/cheese-main.vala:138
+#: ../src/cheese-main.vala:189
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Bitte geben Sie »%s --help« ein, um alle verfügbaren Optionen anzusehen.\n"
 
-#: ../src/cheese-main.vala:153
+#: ../src/cheese-main.vala:204
 #, c-format
 msgid "Another instance of Cheese is currently running\n"
 msgstr "Eine weitere Instanz von Cheese läuft bereits\n"
 
-#: ../src/cheese-window.vala:222
+#: ../src/cheese-main.vala:490
+msgid "translator-credits"
+msgstr ""
+"Daniel G. Siegel \n"
+"Andre Klapper \n"
+"Wolfgang Stöggl \n"
+"Nathan-J. Hirschauer \n"
+"Mario Blättermann \n"
+"Paul Seyfert "
+
+#: ../src/cheese-main.vala:492
+msgid "Cheese Website"
+msgstr "Cheese-Website"
+
+#: ../src/cheese-window.vala:192
 #, c-format
 msgid "Could not open %s"
 msgstr "%s konnte nicht geöffnet werden"
 
-#: ../src/cheese-window.vala:250
+#: ../src/cheese-window.vala:220
 #, c-format
 msgid "Are you sure you want to permanently delete the file?"
 msgid_plural "Are you sure you want to permanently delete %d files?"
 msgstr[0] "Sind Sie sicher, dass Sie die Datei dauerhaft löschen wollen?"
 msgstr[1] "Sind Sie sicher, dass Sie die %d Dateien dauerhaft löschen wollen?"
 
-#: ../src/cheese-window.vala:256
+#: ../src/cheese-window.vala:226
 msgid "If you delete an item, it will be permanently lost"
 msgid_plural "If you delete the items, they will be permanently lost"
 msgstr[0] ""
@@ -518,41 +525,75 @@
 msgstr[1] ""
 "Wenn Sie Elemente löschen, werden sie unwiderruflich verloren gehen."
 
-#: ../src/cheese-window.vala:332
+#: ../src/cheese-window.vala:302
 #, c-format
 msgid "Could not move %s to trash"
 msgstr "%s konnte nicht in den Müll verschoben werden"
 
 #. Nothing selected.
-#: ../src/cheese-window.vala:481
+#: ../src/cheese-window.vala:451
 msgid "Save File"
 msgstr "Datei speichern"
 
-#: ../src/cheese-window.vala:515
+#: ../src/cheese-window.vala:485
 #, c-format
 msgid "Could not save %s"
 msgstr "%s konnte nicht gespeichert werden"
 
-#: ../src/cheese-window.vala:1027
+#: ../src/cheese-window.vala:918
 msgid "Stop _Recording"
 msgstr "Aufnahme _stoppen"
 
-#: ../src/cheese-window.vala:1028
+#: ../src/cheese-window.vala:919
 msgid "Stop recording"
 msgstr "Aufnahme stoppen"
 
-#: ../src/cheese-window.vala:1056
+#: ../src/cheese-window.vala:934 ../src/cheese-window.vala:1508
+msgid "Record a Video"
+msgstr "Video aufnehmen"
+
+#: ../src/cheese-window.vala:935 ../src/cheese-window.vala:1509
+msgid "Record a video"
+msgstr "Video aufnehmen"
+
+#. FIXME: Set the effects action to be inactive.
+#: ../src/cheese-window.vala:970
 msgid "Stop _Taking Pictures"
 msgstr "Fo_toaufnahmen stoppen"
 
-#: ../src/cheese-window.vala:1057
+#: ../src/cheese-window.vala:971
 msgid "Stop taking pictures"
 msgstr "Fotoaufnahmen stoppen"
 
-#: ../src/cheese-window.vala:1240
+#: ../src/cheese-window.vala:994
+msgid "Take Multiple Photos"
+msgstr "Mehrere Fotos aufnehmen"
+
+#: ../src/cheese-window.vala:995 ../src/cheese-window.vala:1516
+msgid "Take multiple photos"
+msgstr "Mehrere Fotos aufnehmen"
+
+#: ../src/cheese-window.vala:1147
 msgid "No effects found"
 msgstr "Kein Effekt gefunden"
 
+#: ../src/cheese-window.vala:1503
+msgid "Take a Photo"
+msgstr "Ein Foto aufnehmen"
+
+#: ../src/cheese-window.vala:1515
+msgid "Take _Multiple Photos"
+msgstr "_Mehrere Fotos aufnehmen"
+
+#~ msgid "_Cheese"
+#~ msgstr "_Cheese"
+
+#~ msgid "_Contents"
+#~ msgstr "I_nhalt"
+
+#~ msgid "Shutter"
+#~ msgstr "Verschluss"
+
 #~ msgid "Could not delete %s"
 #~ msgstr "%s konnte nicht gelöscht werden"
 
diff -Nru cheese-3.5.4/po/el.po cheese-3.5.5/po/el.po
--- cheese-3.5.4/po/el.po	2012-07-16 19:56:57.000000000 +0000
+++ cheese-3.5.5/po/el.po	2012-08-06 21:27:09.000000000 +0000
@@ -13,14 +13,14 @@
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cheese&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-06-25 21:41+0000\n"
-"PO-Revision-Date: 2012-06-26 15:43+0200\n"
+"POT-Creation-Date: 2012-07-29 09:59+0000\n"
+"PO-Revision-Date: 2012-08-06 17:54+0200\n"
 "Last-Translator: Tom Tryfonidis \n"
 "Language-Team: Greek \n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Lokalize 0.2\n"
 "X-Poedit-Language: Greek\n"
@@ -341,6 +341,10 @@
 msgid "Shutter sound"
 msgstr "Ήχος φωτοφράκτη"
 
+#: ../libcheese/cheese-avatar-chooser.c:260
+msgid "Select"
+msgstr "Επιλογή"
+
 #: ../libcheese/cheese-avatar-chooser.c:281
 msgid "_Take a photo"
 msgstr "_Λήψη φωτογραφίας"
@@ -412,7 +416,6 @@
 msgstr "Εκκίνηση σε λειτουργία πλήρους οθόνης"
 
 #: ../src/cheese-main.vala:92
-#| msgid "_Photo"
 msgid "_Shoot"
 msgstr "Λή_ψη"
 
@@ -433,12 +436,10 @@
 msgstr "_Πολλαπλή λήψη"
 
 #: ../src/cheese-main.vala:102
-#| msgid "Fullscreen"
 msgid "_Fullscreen"
 msgstr "_Πλήρης οθόνη"
 
 #: ../src/cheese-main.vala:110
-#| msgid "Preferences"
 msgid "P_references"
 msgstr "Π_ροτιμήσεις"
 
@@ -524,7 +525,6 @@
 
 #: ../src/cheese-window.vala:934
 #: ../src/cheese-window.vala:1508
-#| msgid "_Record a Video"
 msgid "Record a Video"
 msgstr "Εγγραφή βίντεο"
 
@@ -543,7 +543,6 @@
 msgstr "Διακοπή λήψης φωτογραφιών"
 
 #: ../src/cheese-window.vala:994
-#| msgid "Take _Multiple Photos"
 msgid "Take Multiple Photos"
 msgstr "Λήψη πολλαπλών φωτογραφιών"
 
@@ -557,7 +556,6 @@
 msgstr "Δε βρέθηκαν εφέ"
 
 #: ../src/cheese-window.vala:1503
-#| msgid "_Take a Photo"
 msgid "Take a Photo"
 msgstr "Λήψη φωτογραφίας"
 
diff -Nru cheese-3.5.4/po/es.po cheese-3.5.5/po/es.po
--- cheese-3.5.4/po/es.po	2012-07-16 19:56:57.000000000 +0000
+++ cheese-3.5.5/po/es.po	2012-07-30 14:14:15.000000000 +0000
@@ -12,14 +12,15 @@
 "Project-Id-Version: cheese.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=cheese&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-06-25 21:41+0000\n"
-"PO-Revision-Date: 2012-06-26 19:07+0200\n"
+"POT-Creation-Date: 2012-07-29 09:59+0000\n"
+"PO-Revision-Date: 2012-07-29 19:02+0200\n"
 "Last-Translator: Daniel Mustieles \n"
 "Language-Team: Español \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.4\n"
+"X-Generator: Gtranslator 2.91.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/cheese-actions.ui.h:1
@@ -355,6 +356,10 @@
 msgid "Shutter sound"
 msgstr "Sonido del obturador"
 
+#: ../libcheese/cheese-avatar-chooser.c:260
+msgid "Select"
+msgstr "Seleccionar"
+
 #: ../libcheese/cheese-avatar-chooser.c:281
 msgid "_Take a photo"
 msgstr "_Tomar una foto"
@@ -425,7 +430,6 @@
 msgstr "Iniciar en modo a pantalla completa"
 
 #: ../src/cheese-main.vala:92
-#| msgid "_Photo"
 msgid "_Shoot"
 msgstr "_Disparar"
 
@@ -446,12 +450,10 @@
 msgstr "_Ráfaga"
 
 #: ../src/cheese-main.vala:102
-#| msgid "Fullscreen"
 msgid "_Fullscreen"
 msgstr "Pantalla _completa"
 
 #: ../src/cheese-main.vala:110
-#| msgid "Preferences"
 msgid "P_references"
 msgstr "P_referencias"
 
@@ -537,7 +539,6 @@
 msgstr "Detener grabación"
 
 #: ../src/cheese-window.vala:934 ../src/cheese-window.vala:1508
-#| msgid "_Record a Video"
 msgid "Record a Video"
 msgstr "Grabar un vídeo"
 
@@ -555,7 +556,6 @@
 msgstr "Dejar de tomar imágenes"
 
 #: ../src/cheese-window.vala:994
-#| msgid "Take _Multiple Photos"
 msgid "Take Multiple Photos"
 msgstr "Tomar múltiples fotos"
 
@@ -568,7 +568,6 @@
 msgstr "No se encontró ningún efecto"
 
 #: ../src/cheese-window.vala:1503
-#| msgid "_Take a Photo"
 msgid "Take a Photo"
 msgstr "Tomar una foto"
 
diff -Nru cheese-3.5.4/po/gl.po cheese-3.5.5/po/gl.po
--- cheese-3.5.4/po/gl.po	2012-07-16 19:56:57.000000000 +0000
+++ cheese-3.5.5/po/gl.po	2012-07-30 14:14:15.000000000 +0000
@@ -19,8 +19,8 @@
 msgstr ""
 "Project-Id-Version: cheese.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-09 16:16+0200\n"
-"PO-Revision-Date: 2012-07-09 16:17+0200\n"
+"POT-Creation-Date: 2012-07-30 03:26+0200\n"
+"PO-Revision-Date: 2012-07-30 03:26+0200\n"
 "Last-Translator: Fran Dieguez \n"
 "Language-Team: Galician \n"
 "Language: gl\n"
@@ -362,6 +362,10 @@
 msgid "Shutter sound"
 msgstr "Son do obturador"
 
+#: ../libcheese/cheese-avatar-chooser.c:260
+msgid "Select"
+msgstr "Seleccionar"
+
 #: ../libcheese/cheese-avatar-chooser.c:281
 msgid "_Take a photo"
 msgstr "_Sacar unha foto"
diff -Nru cheese-3.5.4/po/gu.po cheese-3.5.5/po/gu.po
--- cheese-3.5.4/po/gu.po	2012-03-26 19:38:28.000000000 +0000
+++ cheese-3.5.5/po/gu.po	2012-07-27 15:25:33.000000000 +0000
@@ -9,8 +9,8 @@
 "Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=cheese&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-01-16 22:57+0000\n"
-"PO-Revision-Date: 2012-03-26 12:34+0530\n"
+"POT-Creation-Date: 2012-06-25 21:41+0000\n"
+"PO-Revision-Date: 2012-07-26 12:21+0530\n"
 "Last-Translator: \n"
 "Language-Team: gu_IN \n"
 "MIME-Version: 1.0\n"
@@ -20,209 +20,150 @@
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 
-#: ../data/cheese-about.ui.h:1
-msgid "Cheese Website"
-msgstr "Cheese વેબસાઈટ"
-
-#: ../data/cheese-about.ui.h:2 ../data/cheese.desktop.in.in.h:3
-msgid "Take photos and videos with your webcam, with fun graphical effects"
-msgstr "- તમારા વેબકેમમાંથી ફોટાઓ અને વીડિયો લો, ગ્રાફિકલ અસરો સાથે આનંદ મેળવો"
-
-#: ../data/cheese-about.ui.h:3
-msgid "translator-credits"
-msgstr "અંકિત પટેલ , શ્ર્વેતા કોઠારી "
-
 #: ../data/cheese-actions.ui.h:1
-msgid "Move _All to Trash"
-msgstr "બધું કચરાપેટીમાં ખસેડો (_A)"
+msgid "Share…"
+msgstr "વહેંચો…"
 
 #: ../data/cheese-actions.ui.h:2
-msgid "Move to _Trash"
-msgstr "કચરાપેટીમાં ખસેડો (_T)"
+msgid "Save _As…"
+msgstr "આ રીતે સંગ્રહો (_A)..."
 
 #: ../data/cheese-actions.ui.h:3
-msgid "Ne_xt Effects"
-msgstr "આગળની અસરો (_x)"
+msgid "Move to _Trash"
+msgstr "કચરાપેટીમાં ખસેડો (_T)"
 
 #: ../data/cheese-actions.ui.h:4
-msgid "P_revious Effects"
-msgstr "પહેલાંની અસરો (_r)"
+msgid "Move _All to Trash"
+msgstr "બધું કચરાપેટીમાં ખસેડો (_A)"
 
 #: ../data/cheese-actions.ui.h:5
-msgid "Record a video"
-msgstr "વિડિઓ રેકોર્ડ કરો"
+msgid "_Wide Mode"
+msgstr "વાઇડ મોડ (_W)"
 
 #: ../data/cheese-actions.ui.h:6
-msgid "Save _As…"
-msgstr "આ રીતે સંગ્રહો (_A)..."
+msgid "P_revious Effects"
+msgstr "પહેલાંની અસરો (_r)"
 
 #: ../data/cheese-actions.ui.h:7
-#| msgid "Save _As…"
-msgid "Share…"
-msgstr "વહેંચો…"
-
-#: ../data/cheese-actions.ui.h:8
-msgid "Take _Multiple Photos"
-msgstr "ઘણાબધા ફોટાઓ લો (_M)"
-
-#: ../data/cheese-actions.ui.h:9 ../data/cheese-main-window.ui.h:7
-#: ../libcheese/cheese-avatar-chooser.c:263
-msgid "Take a photo"
-msgstr "ફોટો લો"
-
-#: ../data/cheese-actions.ui.h:10
-msgid "Take multiple photos"
-msgstr "ઘણાબધા ફોટાઓ લો"
-
-#: ../data/cheese-actions.ui.h:11
-msgid "_About"
-msgstr "વિશે (_A)"
-
-#: ../data/cheese-actions.ui.h:12
-msgid "_Burst"
-msgstr "બર્સ્ટ (_B)"
-
-#: ../data/cheese-actions.ui.h:13
-msgid "_Cheese"
-msgstr "_Cheese"
-
-#: ../data/cheese-actions.ui.h:14
-msgid "_Contents"
-msgstr "વિષયસૂચી (_C)"
-
-#: ../data/cheese-actions.ui.h:15
-msgid "_Edit"
-msgstr "ફેરફાર (_E)"
-
-#: ../data/cheese-actions.ui.h:16 ../data/cheese-main-window.ui.h:9
-msgid "_Effects"
-msgstr "અસરો (_E)"
-
-#: ../data/cheese-actions.ui.h:17
-msgid "_Help"
-msgstr "મદદ (_H)"
-
-#: ../data/cheese-actions.ui.h:18
-msgid "_Photo"
-msgstr "ફોટો (_P)"
-
-#: ../data/cheese-actions.ui.h:19
-msgid "_Record a Video"
-msgstr "વિડિઓ રેકોર્ડ કરો (_R)"
-
-#: ../data/cheese-actions.ui.h:20 ../data/cheese-main-window.ui.h:11
-msgid "_Take a Photo"
-msgstr "ફોટો લો (_T)"
-
-#: ../data/cheese-actions.ui.h:21
-msgid "_Video"
-msgstr "વીડિયો (_V)"
-
-#: ../data/cheese-actions.ui.h:22
-msgid "_Wide Mode"
-msgstr "વાઇડ મોડ (_W)"
+msgid "Ne_xt Effects"
+msgstr "આગળની અસરો (_x)"
 
 #: ../data/cheese-main-window.ui.h:1
-msgid "Effects"
-msgstr "અસરો"
+msgid "Photo mode"
+msgstr "ફોટો મોડ"
 
 #: ../data/cheese-main-window.ui.h:2
-msgid "Leave fullscreen"
-msgstr "સંપૂર્ણ સ્ક્રીનને છોડી દો"
+msgid "Video mode"
+msgstr "વિડિઓ મોડ"
 
 #: ../data/cheese-main-window.ui.h:3
-msgid "Next"
-msgstr "આગળ"
-
-#: ../data/cheese-main-window.ui.h:4
 msgid "Photo burst mode"
 msgstr "ફોટો બર્સ્ટ મોડ"
 
+#: ../data/cheese-main-window.ui.h:4 ../libcheese/cheese-avatar-chooser.c:263
+#: ../src/cheese-window.vala:1504
+msgid "Take a photo"
+msgstr "ફોટો લો"
+
 #: ../data/cheese-main-window.ui.h:5
-msgid "Photo mode"
-msgstr "ફોટો મોડ"
+msgid "_Take a Photo"
+msgstr "ફોટો લો (_T)"
 
 #: ../data/cheese-main-window.ui.h:6
 msgid "Previous"
 msgstr "પહેલાં"
 
-#: ../data/cheese-main-window.ui.h:8
-msgid "Video mode"
-msgstr "વિડિઓ મોડ"
+#: ../data/cheese-main-window.ui.h:7
+msgid "Effects"
+msgstr "અસરો"
+
+#: ../data/cheese-main-window.ui.h:8 ../src/cheese-main.vala:107
+msgid "_Effects"
+msgstr "અસરો (_E)"
+
+#: ../data/cheese-main-window.ui.h:9
+msgid "Next"
+msgstr "આગળ"
 
 #: ../data/cheese-main-window.ui.h:10
+msgid "Leave fullscreen"
+msgstr "સંપૂર્ણ સ્ક્રીનને છોડી દો"
+
+#: ../data/cheese-main-window.ui.h:11
 msgid "_Leave Fullscreen"
 msgstr "સંપૂર્ણ સ્ક્રીનને છોડી દો (_L)"
 
 #: ../data/cheese-prefs.ui.h:1
-msgid "Shutter"
-msgstr "શટર"
+msgid "Preferences"
+msgstr "પસંદગીઓ"
 
 #: ../data/cheese-prefs.ui.h:2
-msgid "Brightness"
-msgstr "તેજસ્વિતા"
+msgid "Device"
+msgstr "ઉપકરણ"
 
 #: ../data/cheese-prefs.ui.h:3
-msgid "Burst mode"
-msgstr "બર્સ્ટ પરિસ્થિતિ"
+msgid "Photo resolution"
+msgstr "ચિત્ર રીઝોલ્યુશન"
 
 #: ../data/cheese-prefs.ui.h:4
-msgid "Capture"
-msgstr "કેદ કરો"
+msgid "Video resolution"
+msgstr "વિડિઓ રિઝોલ્યુશન"
 
 #: ../data/cheese-prefs.ui.h:5
-msgid "Contrast"
-msgstr "વિષમતા"
+msgid "Webcam"
+msgstr "વેબકેમ"
 
 #: ../data/cheese-prefs.ui.h:6
-msgid "Delay between photos (seconds)"
-msgstr "ફોટાઓ વચ્ચે વિલંબ (સેકંડો)"
+msgid "Brightness"
+msgstr "તેજસ્વિતા"
 
 #: ../data/cheese-prefs.ui.h:7
-msgid "Device"
-msgstr "ઉપકરણ"
+msgid "Saturation"
+msgstr "સંતૃપ્તિ"
 
 #: ../data/cheese-prefs.ui.h:8
-msgid "Fire _Flash"
-msgstr "ફાયર ફ્લેશ (_F)"
-
-#: ../data/cheese-prefs.ui.h:9
 msgid "Hue"
 msgstr "રંગ"
 
+#: ../data/cheese-prefs.ui.h:9
+msgid "Contrast"
+msgstr "વિષમતા"
+
 #: ../data/cheese-prefs.ui.h:10
 msgid "Image"
 msgstr "ઇમેજ "
 
 #: ../data/cheese-prefs.ui.h:11
-msgid "Number of photos"
-msgstr "ફોટાઓની સંખ્યા"
+#| msgid "Shutter sound"
+msgid "Shutter"
+msgstr "શટર"
 
 #: ../data/cheese-prefs.ui.h:12
-msgid "Photo resolution"
-msgstr "ચિત્ર રીઝોલ્યુશન"
+msgid "_Countdown"
+msgstr "ગણતરી કરો (_C)"
 
 #: ../data/cheese-prefs.ui.h:13
-msgid "Preferences"
-msgstr "પસંદગીઓ"
+msgid "Fire _Flash"
+msgstr "ફાયર ફ્લેશ (_F)"
 
 #: ../data/cheese-prefs.ui.h:14
-msgid "Saturation"
-msgstr "સંતૃપ્તિ"
+msgid "Burst mode"
+msgstr "બર્સ્ટ પરિસ્થિતિ"
 
 #: ../data/cheese-prefs.ui.h:15
-msgid "Video resolution"
-msgstr "વિડિઓ રિઝોલ્યુશન"
+msgid "Number of photos"
+msgstr "ફોટાઓની સંખ્યા"
 
 #: ../data/cheese-prefs.ui.h:16
-msgid "Webcam"
-msgstr "વેબકેમ"
+msgid "Delay between photos (seconds)"
+msgstr "ફોટાઓ વચ્ચે વિલંબ (સેકંડો)"
 
 #: ../data/cheese-prefs.ui.h:17
-msgid "_Countdown"
-msgstr "ગણતરી કરો (_C)"
+msgid "Capture"
+msgstr "કેદ કરો"
 
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese-main.vala:67
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese-main.vala:81
+#: ../src/cheese-main.vala:489
 msgid "Cheese"
 msgstr "Cheese"
 
@@ -230,196 +171,182 @@
 msgid "Cheese Webcam Booth"
 msgstr "Cheese વેબકેમ બુથ"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:1
-msgid "Adjusts the brightness of the picture coming from the camera"
-msgstr "કૅમેરામાંથી આવતા પિક્ચરની ચેજસ્વિતાને વ્યવસ્થિત કરે છે"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:2
-msgid "Adjusts the contrast of the picture coming from the camera"
-msgstr "કૅમેરામાંથી આવતા ચિત્રનાં વિપરીતને વ્યવસ્થિત કરે છે"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:3
-msgid "Adjusts the hue (color tint) of the picture coming from the camera"
-msgstr "કૅમેરામાંથી આવતા ચિત્રનાં રંગ (રંગભેદ) ને વ્યવસ્થિત કરે છે"
+#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-main.vala:484
+msgid "Take photos and videos with your webcam, with fun graphical effects"
+msgstr "- તમારા વેબકેમમાંથી ફોટાઓ અને વીડિયો લો, ગ્રાફિકલ અસરો સાથે આનંદ મેળવો"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:4
-msgid "Adjusts the saturation of the picture coming from the camera"
-msgstr "કૅમેરામાંથી આવતા ચિત્રની સંતૃપ્તિને વ્યવસ્થિત કરે છે"
+#: ../data/org.gnome.Cheese.gschema.xml.h:1
+msgid "Use a countdown"
+msgstr "ગણતરી કરો"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:5
-msgid "Camera device string indicator"
-msgstr "કેમેરા ઉપકરણ શબ્દમાળા સૂચક"
+#: ../data/org.gnome.Cheese.gschema.xml.h:2
+msgid "Set to true to show a countdown before taking a photo"
+msgstr "ફોટા લેતા પહેલાં ગણતરીને બતાવવા માટે  true તરીકે સુયોજિત કરો"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:6
-#| msgid "_Countdown"
+#: ../data/org.gnome.Cheese.gschema.xml.h:3
 msgid "Countdown length"
 msgstr "ગણતરી લંબાઇ"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:7
-msgid ""
-"Defines the path where the photos are stored. If empty, \"XDG_PHOTO/Webcam\" "
-"will be used."
-msgstr ""
-"પાથને વ્યાખ્યાયિત કરે છે જ્યાં ફોટા સંગ્રહેલ છે. જો ખાલી હોય તો, "
-"\"XDG_PHOTO//Webcam\" "
-"ને વાપરેલ હશે."
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:8
-msgid ""
-"Defines the path where the videos are stored. If empty, \"XDG_VIDEO/Webcam\" "
-"will be used."
-msgstr ""
-"પાથને વ્યાખ્યાયિત કરે છે જ્યાં વિડીયો સંગ્રહેલ છે. જો ખાલી હોય તો, "
-"\"XDG_VIDEO/Webcam\" "
-"ને વાપરેલ હશે."
+#: ../data/org.gnome.Cheese.gschema.xml.h:4
+msgid "The duration of the countdown before taking a photo, in seconds"
+msgstr "ફોટો લેવા માટે ગણતરીનો સમયગાળો સેકંડમાં"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:9
+#: ../data/org.gnome.Cheese.gschema.xml.h:5
 msgid "Fire flash before taking a picture"
 msgstr "ચિત્રને લેતી પહેલાં ફાયર ફ્લૅશ"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:10
-msgid "If set to true, Cheese will start up in fullscreen mode."
-msgstr ""
-"જો તમે true તરીકે સુયોજિત કરો તો, Cheese એ પૂર્ણસ્ક્રીન સ્થિતિમાં શરૂ કરશે."
+#: ../data/org.gnome.Cheese.gschema.xml.h:6
+msgid "Set to true to fire a flash when taking a picture"
+msgstr "ચિત્ર લેતી પહેલાં ફ્લૅશ કરવા માટે true તરીકે સુયોજિત કરો"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:11
+#: ../data/org.gnome.Cheese.gschema.xml.h:7
+msgid "Camera device string indicator"
+msgstr "કેમેરા ઉપકરણ શબ્દમાળા સૂચક"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:8
 msgid ""
-"If set to true, Cheese will start up in wide mode, with the image collection "
-"placed on the right-hand side. Useful with small screens."
-msgstr ""
-"જો true તરીકે સુયોજિત કરો તો, Cheese એ વાઇડ સ્થિતિમાં જમણી બાજુ પર સ્થિત થયેલ "
-"ઇમેજ સંગ્રહ સાથે શરૂ થશે. નાની સ્ક્રીન સાથે ઉપયોગી છે."
+"The path to the device node which points to the camera, for example /dev/"
+"video0"
+msgstr "ઉપકરણ નોડનો પાથ કે જે કૅમેરાને દર્શાવે છે, ઉદાહરણ તરીકે /dev/video0"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:12
+#: ../data/org.gnome.Cheese.gschema.xml.h:9
 msgid "Last selected effect"
 msgstr "છેલ્લે પસંદ થયેલ અસર"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:13
+#: ../data/org.gnome.Cheese.gschema.xml.h:10
 msgid "Name of the installed effect that was selected last"
 msgstr "સ્થાપિત થયેલ અસરનું નામ કે જે છેલ્લે પસંદ કરેલ હતી"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:14
-#| msgid "Number of photos"
-msgid "Number of photos in burst mode"
-msgstr "બર્સ્ટ સ્થિતિમાં ફોટોની સંખ્યા"
+#: ../data/org.gnome.Cheese.gschema.xml.h:11
+msgid "Photo width"
+msgstr "ફોટો પહોળાઇ"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:15
-#| msgid "_Photo"
-msgid "Photo Path"
-msgstr "ફોટો પાથ"
+#: ../data/org.gnome.Cheese.gschema.xml.h:12
+msgid "The width of the image captured from the camera, in pixels"
+msgstr "પિક્સેલમાં કૅમેરામાંથી કેદ થયેલ ઇમેજની પહોળાઇ"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:16
-#| msgid "Photo mode"
+#: ../data/org.gnome.Cheese.gschema.xml.h:13
 msgid "Photo height"
 msgstr "ફોટો ઊંચાઇ"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:17
-#| msgid "Photo mode"
-msgid "Photo width"
-msgstr "ફોટો પહોળાઇ"
+#: ../data/org.gnome.Cheese.gschema.xml.h:14
+msgid "The height of the image captured from the camera, in pixels"
+msgstr "પિક્સેલમાં કૅમેરામાંથી કેદ થયેલ ઇમેજની ઊંચાઇ"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:15
+msgid "Video width"
+msgstr "વિડીયો પહોળાઇ"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:16
+msgid "The width of the video captured from the camera, in pixels"
+msgstr "પિક્સેલમાં કૅમેરામાંથી કેદ થયેલ વિડીયોની પહોળાઇ"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:18
-#| msgid "Brightness"
+#: ../data/org.gnome.Cheese.gschema.xml.h:17
+msgid "Video height"
+msgstr "વિડીયો ઊંચાઇ"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:18
+msgid "The height of the video captured from the camera, in pixels"
+msgstr "પિક્સેલમાં કૅમેરામાંથી કેદ કરેલ વિડીયોની ઊંચાઇ"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:19
 msgid "Picture brightness"
 msgstr "ચિત્ર તેજસ્વિતા"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:19
+#: ../data/org.gnome.Cheese.gschema.xml.h:20
+msgid "Adjusts the brightness of the picture coming from the camera"
+msgstr "કૅમેરામાંથી આવતા પિક્ચરની ચેજસ્વિતાને વ્યવસ્થિત કરે છે"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:21
 msgid "Picture contrast"
 msgstr "વિપરીત ચિત્ર"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:20
-msgid "Picture hue"
-msgstr "ચિત્ર રંગ"
+#: ../data/org.gnome.Cheese.gschema.xml.h:22
+msgid "Adjusts the contrast of the picture coming from the camera"
+msgstr "કૅમેરામાંથી આવતા ચિત્રનાં વિપરીતને વ્યવસ્થિત કરે છે"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:21
-#| msgid "Saturation"
+#: ../data/org.gnome.Cheese.gschema.xml.h:23
 msgid "Picture saturation"
 msgstr "ચિત્ર સંતૃપ્તિ"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:22
-msgid "Set to true to fire a flash when taking a picture"
-msgstr "ચિત્ર લેતી પહેલાં ફ્લૅશ કરવા માટે true તરીકે સુયોજિત કરો"
+#: ../data/org.gnome.Cheese.gschema.xml.h:24
+msgid "Adjusts the saturation of the picture coming from the camera"
+msgstr "કૅમેરામાંથી આવતા ચિત્રની સંતૃપ્તિને વ્યવસ્થિત કરે છે"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:23
-msgid "Set to true to show a countdown before taking a photo"
-msgstr "ફોટા લેતા પહેલાં ગણતરીને બતાવવા માટે  true તરીકે સુયોજિત કરો"
+#: ../data/org.gnome.Cheese.gschema.xml.h:25
+msgid "Picture hue"
+msgstr "ચિત્ર રંગ"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:24
-msgid "The duration of the countdown before taking a photo, in seconds"
-msgstr "ફોટો લેવા માટે ગણતરીનો સમયગાળો સેકંડમાં"
+#: ../data/org.gnome.Cheese.gschema.xml.h:26
+msgid "Adjusts the hue (color tint) of the picture coming from the camera"
+msgstr "કૅમેરામાંથી આવતા ચિત્રનાં રંગ (રંગભેદ) ને વ્યવસ્થિત કરે છે"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:25
-msgid "The height of the image captured from the camera, in pixels"
-msgstr "પિક્સેલમાં કૅમેરામાંથી કેદ થયેલ ઇમેજની ઊંચાઇ"
+#: ../data/org.gnome.Cheese.gschema.xml.h:27
+msgid "Video Path"
+msgstr "વિડીયો પાથ"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:26
-msgid "The height of the video captured from the camera, in pixels"
-msgstr "પિક્સેલમાં કૅમેરામાંથી કેદ કરેલ વિડીયોની ઊંચાઇ"
+#: ../data/org.gnome.Cheese.gschema.xml.h:28
+msgid ""
+"Defines the path where the videos are stored. If empty, \"XDG_VIDEO/Webcam\" "
+"will be used."
+msgstr ""
+"પાથને વ્યાખ્યાયિત કરે છે જ્યાં વિડીયો સંગ્રહેલ છે. જો ખાલી હોય તો, \"XDG_VIDEO/Webcam\" "
+"ને વાપરેલ હશે."
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:29
+msgid "Photo Path"
+msgstr "ફોટો પાથ"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:27
+#: ../data/org.gnome.Cheese.gschema.xml.h:30
 msgid ""
-"The length of time, in milliseconds, to delay between taking each photo in a "
-"burst sequence of photos. If the burst delay is less than the countdown "
-"duration, the countdown duration will be used instead."
+"Defines the path where the photos are stored. If empty, \"XDG_PHOTO/Webcam\" "
+"will be used."
 msgstr ""
-"ફોટાની બર્સ્ટ કતારમાં દરેક ફોટાને લેતી વખતે વિલંબ રાખવા મિલિસેકંડમાં સમયની "
-"લંબાઇ. જો બર્સ્ટ વિલંબ એ ગણતરી સમયગાળા કરતા ઓછુ હોય તો, ગણતરી સમયગાળો એ તેની "
-"બદલે વાપરેલ હશે."
+"પાથને વ્યાખ્યાયિત કરે છે જ્યાં ફોટા સંગ્રહેલ છે. જો ખાલી હોય તો, \"XDG_PHOTO//Webcam\" "
+"ને વાપરેલ હશે."
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:28
-msgid "The number of photos to take in a single burst."
-msgstr "એકજ બર્સ્ટમાં લેવા માટે ફોટાની સંખ્યા."
+#: ../data/org.gnome.Cheese.gschema.xml.h:31
+msgid "Whether to start in wide mode"
+msgstr "ક્યાંતો વાઇડ મોડમાં શરૂ કરો"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:29
+#: ../data/org.gnome.Cheese.gschema.xml.h:32
 msgid ""
-"The path to the device node which points to the camera, for example /dev/"
-"video0"
-msgstr "ઉપકરણ નોડનો પાથ કે જે કૅમેરાને દર્શાવે છે, ઉદાહરણ તરીકે /dev/video0"
+"If set to true, Cheese will start up in wide mode, with the image collection "
+"placed on the right-hand side. Useful with small screens."
+msgstr ""
+"જો true તરીકે સુયોજિત કરો તો, Cheese એ વાઇડ સ્થિતિમાં જમણી બાજુ પર સ્થિત થયેલ ઇમેજ "
+"સંગ્રહ સાથે શરૂ થશે. નાની સ્ક્રીન સાથે ઉપયોગી છે."
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:30
-msgid "The width of the image captured from the camera, in pixels"
-msgstr "પિક્સેલમાં કૅમેરામાંથી કેદ થયેલ ઇમેજની પહોળાઇ"
+#: ../data/org.gnome.Cheese.gschema.xml.h:33
+msgid "Whether to start in fullscreen"
+msgstr "ક્યાંતો પૂર્ણસ્ક્રીન સ્થિતિમાં શરૂ કરો"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:31
-msgid "The width of the video captured from the camera, in pixels"
-msgstr "પિક્સેલમાં કૅમેરામાંથી કેદ થયેલ વિડીયોની પહોળાઇ"
+#: ../data/org.gnome.Cheese.gschema.xml.h:34
+msgid "If set to true, Cheese will start up in fullscreen mode."
+msgstr "જો તમે true તરીકે સુયોજિત કરો તો, Cheese એ પૂર્ણસ્ક્રીન સ્થિતિમાં શરૂ કરશે."
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:32
-#| msgid "Delay between photos (seconds)"
+#: ../data/org.gnome.Cheese.gschema.xml.h:35
 msgid "Time between photos in burst mode"
 msgstr "બર્સ્ટ સ્થિતિમાં ફોટા વચ્ચે સમય"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:33
-#| msgid "_Countdown"
-msgid "Use a countdown"
-msgstr "ગણતરી કરો"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:34
-#| msgid "_Video"
-msgid "Video Path"
-msgstr "વિડીયો પાથ"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:35
-#| msgid "Video mode"
-msgid "Video height"
-msgstr "વિડીયો ઊંચાઇ"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:36
-#| msgid "Video mode"
-msgid "Video width"
-msgstr "વિડીયો પહોળાઇ"
+#: ../data/org.gnome.Cheese.gschema.xml.h:36
+msgid ""
+"The length of time, in milliseconds, to delay between taking each photo in a "
+"burst sequence of photos. If the burst delay is less than the countdown "
+"duration, the countdown duration will be used instead."
+msgstr ""
+"ફોટાની બર્સ્ટ કતારમાં દરેક ફોટાને લેતી વખતે વિલંબ રાખવા મિલિસેકંડમાં સમયની લંબાઇ. જો "
+"બર્સ્ટ વિલંબ એ ગણતરી સમયગાળા કરતા ઓછુ હોય તો, ગણતરી સમયગાળો એ તેની બદલે વાપરેલ હશે."
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:37
-#| msgid "Start in fullscreen mode"
-msgid "Whether to start in fullscreen"
-msgstr "ક્યાંતો પૂર્ણસ્ક્રીન સ્થિતિમાં શરૂ કરો"
+#: ../data/org.gnome.Cheese.gschema.xml.h:37
+msgid "Number of photos in burst mode"
+msgstr "બર્સ્ટ સ્થિતિમાં ફોટોની સંખ્યા"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:38
-#| msgid "Start in wide mode"
-msgid "Whether to start in wide mode"
-msgstr "ક્યાંતો વાઇડ મોડમાં શરૂ કરો"
+#: ../data/org.gnome.Cheese.gschema.xml.h:38
+msgid "The number of photos to take in a single burst."
+msgstr "એકજ બર્સ્ટમાં લેવા માટે ફોટાની સંખ્યા."
 
-#: ../libcheese/cheese-avatar-chooser.c:138 ../src/cheese-window.vala:850
+#: ../libcheese/cheese-avatar-chooser.c:138 ../src/cheese-window.vala:807
 msgid "Shutter sound"
 msgstr "શટર અવાજ"
 
@@ -448,108 +375,206 @@
 msgid "Cancellable initialization not supported"
 msgstr "રદ કરી શકાય તેવુ આરંભીકરણ આધારભૂત નથી"
 
-#: ../libcheese/cheese-camera.c:1492
+#: ../libcheese/cheese-camera.c:430 ../libcheese/cheese-camera.c:1549
+msgid "One or more needed GStreamer elements are missing: "
+msgstr "એક અથવા વધારે જરૂરી GStreamer ઘટકો ગેરહાજર છે: "
+
+#: ../libcheese/cheese-camera.c:1509
 #, c-format
 msgid "No device found"
 msgstr "ઉપકરણ મળ્યુ નહિં"
 
-#: ../libcheese/cheese-camera.c:1542
-msgid "One or more needed GStreamer elements are missing: "
-msgstr "એક અથવા વધારે જરૂરી GStreamer ઘટકો ગેરહાજર છે: "
+#. Translators: This is a time format, like "09:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../libcheese/cheese-camera.c:1786
+#, c-format
+msgctxt "time format"
+msgid "%02i:%02i:%02i"
+msgstr "%02i:%02i:%02i"
 
 #: ../src/cheese-effects-manager.vala:50
 msgid "No Effect"
 msgstr "કોઈ અસરો નથી"
 
-#: ../src/cheese-main.vala:37
+#: ../src/cheese-main.vala:51
 msgid "Start in wide mode"
 msgstr "વાઇડ મોડમાં શરૂ કરો"
 
-#: ../src/cheese-main.vala:38
+#: ../src/cheese-main.vala:52
 msgid "Device to use as a camera"
 msgstr "કૅમેરા તરીકે વપરાતુ ઉપકરણ"
 
-#: ../src/cheese-main.vala:38
+#: ../src/cheese-main.vala:52
 msgid "DEVICE"
 msgstr "DEVICE"
 
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:53
 msgid "Output version information and exit"
 msgstr "આઉટપુટ આવૃત્તિ જાણકારી અને બહાર નીકળો"
 
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:54
 msgid "Start in fullscreen mode"
 msgstr "પૂર્ણસ્ક્રીન સ્થિતિમાં શરૂ કરો"
 
-#: ../src/cheese-main.vala:126
+#: ../src/cheese-main.vala:92
+#| msgid "_Photo"
+msgid "_Shoot"
+msgstr "ફોટો પાડવો (_S)"
+
+#: ../src/cheese-main.vala:96
+msgid "Mode:"
+msgstr "સ્થિતિ:"
+
+#: ../src/cheese-main.vala:97
+msgid "_Photo"
+msgstr "ફોટો (_P)"
+
+#: ../src/cheese-main.vala:98
+msgid "_Video"
+msgstr "વીડિયો (_V)"
+
+#: ../src/cheese-main.vala:99
+msgid "_Burst"
+msgstr "બર્સ્ટ (_B)"
+
+#: ../src/cheese-main.vala:102
+#| msgid "_Leave Fullscreen"
+msgid "_Fullscreen"
+msgstr "સંપૂર્ણ સ્ક્રીન (_F)"
+
+#: ../src/cheese-main.vala:110
+#| msgid "Preferences"
+msgid "P_references"
+msgstr "પસંદગીઓ (_r)"
+
+#: ../src/cheese-main.vala:113
+msgid "_About"
+msgstr "વિશે (_A)"
+
+#: ../src/cheese-main.vala:114
+msgid "_Help"
+msgstr "મદદ (_H)"
+
+#: ../src/cheese-main.vala:117
+#| msgid "_Edit"
+msgid "_Quit"
+msgstr "બહાર નીકળો (_Q)"
+
+#: ../src/cheese-main.vala:177
 msgid "- Take photos and videos from your webcam"
 msgstr "- તમારા વેબકેમમાંથી ફોટાઓ અને વીડિયો લો"
 
-#: ../src/cheese-main.vala:138
+#: ../src/cheese-main.vala:189
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr "ઉપલબ્ધ આદેશ વાક્ય વિકલ્પોની સંપૂર્ણ યાદીને જોવા માટે '%s --help' ચલાવો.\n"
 
-#: ../src/cheese-main.vala:153
+#: ../src/cheese-main.vala:204
 #, c-format
 msgid "Another instance of Cheese is currently running\n"
 msgstr "Cheese નું બીજુ ઉદાહરણ હાલમાં ચાલી રહ્યુ છે\n"
 
-#: ../src/cheese-window.vala:224
+#: ../src/cheese-main.vala:490
+msgid "translator-credits"
+msgstr "અંકિત પટેલ , શ્ર્વેતા કોઠારી "
+
+#: ../src/cheese-main.vala:492
+msgid "Cheese Website"
+msgstr "Cheese વેબસાઈટ"
+
+#: ../src/cheese-window.vala:192
 #, c-format
 msgid "Could not open %s"
 msgstr "%s ને ખોલી શક્યા નહિં"
 
-#: ../src/cheese-window.vala:252
+#: ../src/cheese-window.vala:220
 #, c-format
 msgid "Are you sure you want to permanently delete the file?"
 msgid_plural "Are you sure you want to permanently delete %d files?"
 msgstr[0] "શું તમે ખરેખર કાયમ માટે ફાઇલને કાઢી નાંખવા માંગો છો?"
 msgstr[1] "શું તમે ખરેખર કાયમ માટે %d ફાઇલોને કાઢી નાંખવા માંગો છો?"
 
-#: ../src/cheese-window.vala:258
+#: ../src/cheese-window.vala:226
 msgid "If you delete an item, it will be permanently lost"
 msgid_plural "If you delete the items, they will be permanently lost"
 msgstr[0] "જો તમે વસ્તુને કાઢી નાંખો તો, તે કાયમ માટે ગુમ થઇ જશે"
 msgstr[1] "જો તમે વસ્તુઓને કાઢી નાંખો તો, તે કાયમ માટે ગુમ થઇ જશે"
 
-#: ../src/cheese-window.vala:334
+#: ../src/cheese-window.vala:302
 #, c-format
 msgid "Could not move %s to trash"
 msgstr "કચરાપેટીમાં %s ને ખસેડી શક્યા નહિં"
 
 #. Nothing selected.
-#: ../src/cheese-window.vala:413
+#: ../src/cheese-window.vala:451
 msgid "Save File"
 msgstr "ફાઇલને સંગ્રહો"
 
-#: ../src/cheese-window.vala:447
+#: ../src/cheese-window.vala:485
 #, c-format
 msgid "Could not save %s"
 msgstr "%s નો સંગ્રહ કરી શક્યા નહિં"
 
-#: ../src/cheese-window.vala:959
+#: ../src/cheese-window.vala:918
 msgid "Stop _Recording"
 msgstr "રેકોર્ડ કરવાનું બંધ કરો (_R)"
 
-#: ../src/cheese-window.vala:960
-#| msgid "Stop _Recording"
+#: ../src/cheese-window.vala:919
 msgid "Stop recording"
 msgstr "રેકોર્ડ કરવાનું બંધ કરો"
 
-#: ../src/cheese-window.vala:988
+#: ../src/cheese-window.vala:934 ../src/cheese-window.vala:1508
+#| msgid "_Record a Video"
+msgid "Record a Video"
+msgstr "વિડિઓ રેકોર્ડ કરો"
+
+#: ../src/cheese-window.vala:935 ../src/cheese-window.vala:1509
+msgid "Record a video"
+msgstr "વિડિઓ રેકોર્ડ કરો"
+
+#. FIXME: Set the effects action to be inactive.
+#: ../src/cheese-window.vala:970
 msgid "Stop _Taking Pictures"
 msgstr "ચિત્રો લેવાનું બંધ કરો (_T)"
 
-#: ../src/cheese-window.vala:989
-#| msgid "Stop _Taking Pictures"
+#: ../src/cheese-window.vala:971
 msgid "Stop taking pictures"
 msgstr "ચિત્રો લેવાનું બંધ કરો"
 
-#: ../src/cheese-window.vala:1172
+#: ../src/cheese-window.vala:994
+#| msgid "Take _Multiple Photos"
+msgid "Take Multiple Photos"
+msgstr "ઘણા ફોટા લો"
+
+#: ../src/cheese-window.vala:995 ../src/cheese-window.vala:1516
+msgid "Take multiple photos"
+msgstr "ઘણાબધા ફોટાઓ લો"
+
+#: ../src/cheese-window.vala:1147
 msgid "No effects found"
 msgstr "કોઈ અસરો નથી"
 
+#: ../src/cheese-window.vala:1503
+#| msgid "_Take a Photo"
+msgid "Take a Photo"
+msgstr "ફોટો લો"
+
+#: ../src/cheese-window.vala:1515
+msgid "Take _Multiple Photos"
+msgstr "ઘણાબધા ફોટાઓ લો (_M)"
+
+#~ msgid "_Cheese"
+#~ msgstr "_Cheese"
+
+#~ msgid "_Contents"
+#~ msgstr "વિષયસૂચી (_C)"
+
+#~ msgid "Shutter"
+#~ msgstr "શટર"
+
 #~ msgid ""
 #~ "This program is free software; you can redistribute it and/or modify it "
 #~ "under the terms of the GNU General Public License as published by the "
diff -Nru cheese-3.5.4/po/ja.po cheese-3.5.5/po/ja.po
--- cheese-3.5.4/po/ja.po	2012-06-22 21:04:43.000000000 +0000
+++ cheese-3.5.5/po/ja.po	2012-08-04 13:51:20.000000000 +0000
@@ -60,7 +60,7 @@
 
 #: ../data/cheese-actions.ui.h:5
 msgid "_About"
-msgstr "情報(_A)"
+msgstr "このアプリケーションについて(_A)"
 
 #: ../data/cheese-actions.ui.h:6
 msgid "Share…"
diff -Nru cheese-3.5.4/po/sl.po cheese-3.5.5/po/sl.po
--- cheese-3.5.4/po/sl.po	2012-07-16 19:56:57.000000000 +0000
+++ cheese-3.5.5/po/sl.po	2012-07-30 14:14:15.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: cheese master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cheese&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-06-25 21:41+0000\n"
-"PO-Revision-Date: 2012-06-26 09:03+0100\n"
+"POT-Creation-Date: 2012-07-29 09:59+0000\n"
+"PO-Revision-Date: 2012-07-29 14:32+0100\n"
 "Last-Translator: Matej Urbančič \n"
 "Language-Team: Slovenian GNOME Translation Team \n"
 "Language: \n"
@@ -337,6 +337,10 @@
 msgid "Shutter sound"
 msgstr "Zvok zaklopke"
 
+#: ../libcheese/cheese-avatar-chooser.c:260
+msgid "Select"
+msgstr "Izberi"
+
 #: ../libcheese/cheese-avatar-chooser.c:281
 msgid "_Take a photo"
 msgstr "_Zajemi fotografijo"
diff -Nru cheese-3.5.4/po/zh_CN.po cheese-3.5.5/po/zh_CN.po
--- cheese-3.5.4/po/zh_CN.po	2012-03-06 17:59:22.000000000 +0000
+++ cheese-3.5.5/po/zh_CN.po	2012-07-27 15:25:33.000000000 +0000
@@ -19,124 +19,41 @@
 "Project-Id-Version: cheese master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=cheese&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-02-25 06:32+0000\n"
-"PO-Revision-Date: 2012-02-25 21:44+0800\n"
+"POT-Creation-Date: 2012-07-17 15:02+0000\n"
+"PO-Revision-Date: 2012-07-18 12:14+0800\n"
 "Last-Translator: Wylmer Wang \n"
 "Language-Team: Chinese (simplified) \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/cheese-about.ui.h:1 ../data/cheese.desktop.in.in.h:3
-msgid "Take photos and videos with your webcam, with fun graphical effects"
-msgstr "使用摄像头拍照或录像，并加上有趣的图像效果"
-
-#: ../data/cheese-about.ui.h:2
-msgid "Cheese Website"
-msgstr "茄子网站"
-
-#: ../data/cheese-about.ui.h:3
-msgid "translator-credits"
-msgstr ""
-"YangZhang , 2008\n"
-"甘露 (Gan Lu) , 2009\n"
-"arccos (L.Q) , 2009\n"
-"Tao Wei , 2009\n"
-"Aron Xu , 2010\n"
-"lainme , 2010\n"
-"指冷玉笙寒 (dhyang) , 2010\n"
-"ben , 2011\n"
-"YunQiang Su , 2011.\n"
-"chiachen , 2011\n"
-"Wylmer Wang, 2011"
-
 #: ../data/cheese-actions.ui.h:1
-msgid "_Cheese"
-msgstr "茄子(_C)"
-
-#: ../data/cheese-actions.ui.h:2
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: ../data/cheese-actions.ui.h:3
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: ../data/cheese-actions.ui.h:4
-msgid "_Contents"
-msgstr "内容(_C)"
-
-#: ../data/cheese-actions.ui.h:5
-msgid "_About"
-msgstr "关于(_A)"
-
-#: ../data/cheese-actions.ui.h:6
 msgid "Share…"
 msgstr "共享..."
 
-#: ../data/cheese-actions.ui.h:7
+#: ../data/cheese-actions.ui.h:2
 msgid "Save _As…"
 msgstr "另存为(_A)..."
 
-#: ../data/cheese-actions.ui.h:8
+#: ../data/cheese-actions.ui.h:3
 msgid "Move to _Trash"
 msgstr "移入回收站(_T)"
 
-#: ../data/cheese-actions.ui.h:9
+#: ../data/cheese-actions.ui.h:4
 msgid "Move _All to Trash"
 msgstr "全部移入回收站(_A)"
 
-#: ../data/cheese-actions.ui.h:10
+#: ../data/cheese-actions.ui.h:5
 msgid "_Wide Mode"
 msgstr "宽屏模式(_W)"
 
-#: ../data/cheese-actions.ui.h:11 ../data/cheese-main-window.ui.h:5
-msgid "_Take a Photo"
-msgstr "拍照(_T)"
-
-#: ../data/cheese-actions.ui.h:12 ../data/cheese-main-window.ui.h:4
-#: ../libcheese/cheese-avatar-chooser.c:263
-msgid "Take a photo"
-msgstr "拍照"
-
-#: ../data/cheese-actions.ui.h:13
-msgid "_Record a Video"
-msgstr "录像(_R)"
-
-#: ../data/cheese-actions.ui.h:14
-msgid "Record a video"
-msgstr "录像"
-
-#: ../data/cheese-actions.ui.h:15
-msgid "Take _Multiple Photos"
-msgstr "拍摄多张照片(_M)"
-
-#: ../data/cheese-actions.ui.h:16
-msgid "Take multiple photos"
-msgstr "拍摄多张照片"
-
-#: ../data/cheese-actions.ui.h:17
-msgid "_Photo"
-msgstr "照片(_P)"
-
-#: ../data/cheese-actions.ui.h:18
-msgid "_Video"
-msgstr "视频(_V)"
-
-#: ../data/cheese-actions.ui.h:19
-msgid "_Burst"
-msgstr "连拍(_B)"
-
-#: ../data/cheese-actions.ui.h:20 ../data/cheese-main-window.ui.h:8
-msgid "_Effects"
-msgstr "效果(_E)"
-
-#: ../data/cheese-actions.ui.h:21
+#: ../data/cheese-actions.ui.h:6
 msgid "P_revious Effects"
 msgstr "上一批效果(_R)"
 
-#: ../data/cheese-actions.ui.h:22
+#: ../data/cheese-actions.ui.h:7
 msgid "Ne_xt Effects"
 msgstr "下一批效果(_X)"
 
@@ -152,6 +69,15 @@
 msgid "Photo burst mode"
 msgstr "连拍模式"
 
+#: ../data/cheese-main-window.ui.h:4 ../libcheese/cheese-avatar-chooser.c:263
+#: ../src/cheese-window.vala:1504
+msgid "Take a photo"
+msgstr "拍照"
+
+#: ../data/cheese-main-window.ui.h:5
+msgid "_Take a Photo"
+msgstr "拍照(_T)"
+
 #: ../data/cheese-main-window.ui.h:6
 msgid "Previous"
 msgstr "向前"
@@ -160,6 +86,10 @@
 msgid "Effects"
 msgstr "效果"
 
+#: ../data/cheese-main-window.ui.h:8 ../src/cheese-main.vala:107
+msgid "_Effects"
+msgstr "效果(_E)"
+
 #: ../data/cheese-main-window.ui.h:9
 msgid "Next"
 msgstr "向后"
@@ -213,8 +143,9 @@
 msgstr "图像"
 
 #: ../data/cheese-prefs.ui.h:11
-msgid "Shutter"
-msgstr "快门"
+#| msgid "Shutter sound"
+msgid "Shutter"
+msgstr "快门"
 
 #: ../data/cheese-prefs.ui.h:12
 msgid "_Countdown"
@@ -240,7 +171,8 @@
 msgid "Capture"
 msgstr "抓取"
 
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese-main.vala:67
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese-main.vala:81
+#: ../src/cheese-main.vala:489
 msgid "Cheese"
 msgstr "茄子"
 
@@ -248,156 +180,160 @@
 msgid "Cheese Webcam Booth"
 msgstr "茄子大头贴"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:1
+#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-main.vala:484
+msgid "Take photos and videos with your webcam, with fun graphical effects"
+msgstr "使用摄像头拍照或录像，并加上有趣的图像效果"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:1
 msgid "Use a countdown"
 msgstr "使用倒计时"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:2
+#: ../data/org.gnome.Cheese.gschema.xml.h:2
 msgid "Set to true to show a countdown before taking a photo"
 msgstr "如果想在拍照前显示倒计时，请设为 true"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:3
+#: ../data/org.gnome.Cheese.gschema.xml.h:3
 msgid "Countdown length"
 msgstr "倒计时长度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:4
+#: ../data/org.gnome.Cheese.gschema.xml.h:4
 msgid "The duration of the countdown before taking a photo, in seconds"
 msgstr "拍照前倒计时的秒数"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:5
+#: ../data/org.gnome.Cheese.gschema.xml.h:5
 msgid "Fire flash before taking a picture"
 msgstr "在拍照前闪光"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:6
+#: ../data/org.gnome.Cheese.gschema.xml.h:6
 msgid "Set to true to fire a flash when taking a picture"
 msgstr "如果想在拍照时闪光，请设为 true"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:7
+#: ../data/org.gnome.Cheese.gschema.xml.h:7
 msgid "Camera device string indicator"
 msgstr "相机设备字符串指示器"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:8
+#: ../data/org.gnome.Cheese.gschema.xml.h:8
 msgid ""
 "The path to the device node which points to the camera, for example /dev/"
 "video0"
 msgstr "指向摄像头的设备节点路径，例如 /dev/video0"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:9
+#: ../data/org.gnome.Cheese.gschema.xml.h:9
 msgid "Last selected effect"
 msgstr "上次选择的效果"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:10
+#: ../data/org.gnome.Cheese.gschema.xml.h:10
 msgid "Name of the installed effect that was selected last"
 msgstr "上次选择的已安装效果的数量"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:11
+#: ../data/org.gnome.Cheese.gschema.xml.h:11
 msgid "Photo width"
 msgstr "照片宽度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:12
+#: ../data/org.gnome.Cheese.gschema.xml.h:12
 msgid "The width of the image captured from the camera, in pixels"
 msgstr "从摄像头截取图像的宽度，单位是像素"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:13
+#: ../data/org.gnome.Cheese.gschema.xml.h:13
 msgid "Photo height"
 msgstr "照片高度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:14
+#: ../data/org.gnome.Cheese.gschema.xml.h:14
 msgid "The height of the image captured from the camera, in pixels"
 msgstr "从摄像头截取图像的高度，单位是像素"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:15
+#: ../data/org.gnome.Cheese.gschema.xml.h:15
 msgid "Video width"
 msgstr "视频宽度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:16
+#: ../data/org.gnome.Cheese.gschema.xml.h:16
 msgid "The width of the video captured from the camera, in pixels"
 msgstr "从摄像头截取视频的宽度，单位是像素"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:17
+#: ../data/org.gnome.Cheese.gschema.xml.h:17
 msgid "Video height"
 msgstr "视频高度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:18
+#: ../data/org.gnome.Cheese.gschema.xml.h:18
 msgid "The height of the video captured from the camera, in pixels"
 msgstr "从摄像头截取视频的高度，单位是像素"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:19
+#: ../data/org.gnome.Cheese.gschema.xml.h:19
 msgid "Picture brightness"
 msgstr "照片亮度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:20
+#: ../data/org.gnome.Cheese.gschema.xml.h:20
 msgid "Adjusts the brightness of the picture coming from the camera"
 msgstr "调整摄像头图像的亮度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:21
+#: ../data/org.gnome.Cheese.gschema.xml.h:21
 msgid "Picture contrast"
 msgstr "照片对比度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:22
+#: ../data/org.gnome.Cheese.gschema.xml.h:22
 msgid "Adjusts the contrast of the picture coming from the camera"
 msgstr "调整摄像头图像的对比度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:23
+#: ../data/org.gnome.Cheese.gschema.xml.h:23
 msgid "Picture saturation"
 msgstr "照片饱和度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:24
+#: ../data/org.gnome.Cheese.gschema.xml.h:24
 msgid "Adjusts the saturation of the picture coming from the camera"
 msgstr "调整摄像头图像的饱和度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:25
+#: ../data/org.gnome.Cheese.gschema.xml.h:25
 msgid "Picture hue"
 msgstr "照片色调"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:26
+#: ../data/org.gnome.Cheese.gschema.xml.h:26
 msgid "Adjusts the hue (color tint) of the picture coming from the camera"
 msgstr "调整摄像头图像的色调"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:27
+#: ../data/org.gnome.Cheese.gschema.xml.h:27
 msgid "Video Path"
 msgstr "视频路径"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:28
+#: ../data/org.gnome.Cheese.gschema.xml.h:28
 msgid ""
 "Defines the path where the videos are stored. If empty, \"XDG_VIDEO/Webcam\" "
 "will be used."
 msgstr "指定保存视频的路径。如果为空，将使用“XDG_VIDEO/Webcam”。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:29
+#: ../data/org.gnome.Cheese.gschema.xml.h:29
 msgid "Photo Path"
 msgstr "照片路径"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:30
+#: ../data/org.gnome.Cheese.gschema.xml.h:30
 msgid ""
 "Defines the path where the photos are stored. If empty, \"XDG_PHOTO/Webcam\" "
 "will be used."
 msgstr "指定保存照片的路径。如果为空，将使用“XDG_PHOTO/Webcam”。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:31
+#: ../data/org.gnome.Cheese.gschema.xml.h:31
 msgid "Whether to start in wide mode"
 msgstr "是否以宽屏模式启动"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:32
+#: ../data/org.gnome.Cheese.gschema.xml.h:32
 msgid ""
 "If set to true, Cheese will start up in wide mode, with the image collection "
 "placed on the right-hand side. Useful with small screens."
 msgstr ""
 "如果设为 true，Cheese 会以宽屏方式启动，图集置于右侧。该方式适用于小屏幕。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:33
+#: ../data/org.gnome.Cheese.gschema.xml.h:33
 msgid "Whether to start in fullscreen"
 msgstr "是否以全屏模式启动"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:34
+#: ../data/org.gnome.Cheese.gschema.xml.h:34
 msgid "If set to true, Cheese will start up in fullscreen mode."
 msgstr "如果设为 true，Cheese 将以全屏方式启动。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:35
+#: ../data/org.gnome.Cheese.gschema.xml.h:35
 msgid "Time between photos in burst mode"
 msgstr "照片连拍间隔时间"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:36
+#: ../data/org.gnome.Cheese.gschema.xml.h:36
 msgid ""
 "The length of time, in milliseconds, to delay between taking each photo in a "
 "burst sequence of photos. If the burst delay is less than the countdown "
@@ -406,15 +342,15 @@
 "一组连拍照片中各照片间的延时，单位为毫秒。如果连拍延时比倒计时持续时间短，将"
 "转而使用倒计时的时长。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:37
+#: ../data/org.gnome.Cheese.gschema.xml.h:37
 msgid "Number of photos in burst mode"
 msgstr "连拍照片数"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:38
+#: ../data/org.gnome.Cheese.gschema.xml.h:38
 msgid "The number of photos to take in a single burst."
 msgstr "一次连拍的照片数量。"
 
-#: ../libcheese/cheese-avatar-chooser.c:138 ../src/cheese-window.vala:918
+#: ../libcheese/cheese-avatar-chooser.c:138 ../src/cheese-window.vala:807
 msgid "Shutter sound"
 msgstr "快门声"
 
@@ -443,104 +379,216 @@
 msgid "Cancellable initialization not supported"
 msgstr "不支持可中断初始化"
 
-#: ../libcheese/cheese-camera.c:1489
+#: ../libcheese/cheese-camera.c:430 ../libcheese/cheese-camera.c:1549
+msgid "One or more needed GStreamer elements are missing: "
+msgstr "缺少所需的一个或多个 GStreamer 元素："
+
+#: ../libcheese/cheese-camera.c:1509
 #, c-format
 msgid "No device found"
 msgstr "未发现设备"
 
-#: ../libcheese/cheese-camera.c:1539
-msgid "One or more needed GStreamer elements are missing: "
-msgstr "缺少所需的一个或多个 GStreamer 元素："
+#. Translators: This is a time format, like "09:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../libcheese/cheese-camera.c:1786
+#, c-format
+msgctxt "time format"
+msgid "%02i:%02i:%02i"
+msgstr "%02i:%02i:%02i"
 
 #: ../src/cheese-effects-manager.vala:50
 msgid "No Effect"
 msgstr "无效果"
 
-#: ../src/cheese-main.vala:37
+#: ../src/cheese-main.vala:51
 msgid "Start in wide mode"
 msgstr "以宽屏模式启动"
 
-#: ../src/cheese-main.vala:38
+#: ../src/cheese-main.vala:52
 msgid "Device to use as a camera"
 msgstr "用作摄像头的设备"
 
-#: ../src/cheese-main.vala:38
+#: ../src/cheese-main.vala:52
 msgid "DEVICE"
 msgstr "设备"
 
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:53
 msgid "Output version information and exit"
 msgstr "输出版本信息并退出"
 
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:54
 msgid "Start in fullscreen mode"
 msgstr "以全屏模式启动"
 
-#: ../src/cheese-main.vala:126
+#: ../src/cheese-main.vala:92
+msgid "_Shoot"
+msgstr "拍摄(_S)"
+
+#: ../src/cheese-main.vala:96
+msgid "Mode:"
+msgstr "模式："
+
+#: ../src/cheese-main.vala:97
+msgid "_Photo"
+msgstr "照片(_P)"
+
+#: ../src/cheese-main.vala:98
+msgid "_Video"
+msgstr "视频(_V)"
+
+#: ../src/cheese-main.vala:99
+msgid "_Burst"
+msgstr "连拍(_B)"
+
+#: ../src/cheese-main.vala:102
+#| msgid "Fullscreen"
+msgid "_Fullscreen"
+msgstr "全屏(_F)"
+
+#: ../src/cheese-main.vala:110
+#| msgid "Preferences"
+msgid "P_references"
+msgstr "首选项(_R)"
+
+#: ../src/cheese-main.vala:113
+msgid "_About"
+msgstr "关于(_A)"
+
+#: ../src/cheese-main.vala:114
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../src/cheese-main.vala:117
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: ../src/cheese-main.vala:177
 msgid "- Take photos and videos from your webcam"
 msgstr "- 使用摄像头拍摄照片和视频"
 
-#: ../src/cheese-main.vala:138
+#: ../src/cheese-main.vala:189
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr "运行“%s --help”来查看可用命令行选项的完整列表。\n"
 
-#: ../src/cheese-main.vala:153
+#: ../src/cheese-main.vala:204
 #, c-format
 msgid "Another instance of Cheese is currently running\n"
 msgstr "另一个 Cheese 实例已在运行\n"
 
-#: ../src/cheese-window.vala:222
+#: ../src/cheese-main.vala:490
+msgid "translator-credits"
+msgstr ""
+"YangZhang , 2008\n"
+"甘露 (Gan Lu) , 2009\n"
+"arccos (L.Q) , 2009\n"
+"Tao Wei , 2009\n"
+"Aron Xu , 2010\n"
+"lainme , 2010\n"
+"指冷玉笙寒 (dhyang) , 2010\n"
+"ben , 2011\n"
+"YunQiang Su , 2011.\n"
+"chiachen , 2011\n"
+"Wylmer Wang, 2011"
+
+#: ../src/cheese-main.vala:492
+msgid "Cheese Website"
+msgstr "茄子网站"
+
+#: ../src/cheese-window.vala:192
 #, c-format
 msgid "Could not open %s"
 msgstr "打不开 %s"
 
-#: ../src/cheese-window.vala:250
+#: ../src/cheese-window.vala:220
 #, c-format
 msgid "Are you sure you want to permanently delete the file?"
 msgid_plural "Are you sure you want to permanently delete %d files?"
 msgstr[0] "您确实想永久删除这 %d 个文件吗？"
 
-#: ../src/cheese-window.vala:256
+#: ../src/cheese-window.vala:226
 msgid "If you delete an item, it will be permanently lost"
 msgid_plural "If you delete the items, they will be permanently lost"
 msgstr[0] "如果您删除这些项目，它们会永远消失"
 
-#: ../src/cheese-window.vala:332
+#: ../src/cheese-window.vala:302
 #, c-format
 msgid "Could not move %s to trash"
 msgstr "无法将 %s 移到回收站"
 
 #. Nothing selected.
-#: ../src/cheese-window.vala:481
+#: ../src/cheese-window.vala:451
 msgid "Save File"
 msgstr "保存文件"
 
-#: ../src/cheese-window.vala:515
+#: ../src/cheese-window.vala:485
 #, c-format
 msgid "Could not save %s"
 msgstr "无法保存 %s"
 
-#: ../src/cheese-window.vala:1027
+#: ../src/cheese-window.vala:918
 msgid "Stop _Recording"
 msgstr "停止录像(_R)"
 
-#: ../src/cheese-window.vala:1028
+#: ../src/cheese-window.vala:919
 msgid "Stop recording"
 msgstr "停止录像"
 
-#: ../src/cheese-window.vala:1056
+#: ../src/cheese-window.vala:934 ../src/cheese-window.vala:1508
+#| msgid "_Record a Video"
+msgid "Record a Video"
+msgstr "录像"
+
+#: ../src/cheese-window.vala:935 ../src/cheese-window.vala:1509
+msgid "Record a video"
+msgstr "录像"
+
+#. FIXME: Set the effects action to be inactive.
+#: ../src/cheese-window.vala:970
 msgid "Stop _Taking Pictures"
 msgstr "停止拍照(_T)"
 
-#: ../src/cheese-window.vala:1057
+#: ../src/cheese-window.vala:971
 msgid "Stop taking pictures"
 msgstr "停止拍照"
 
-#: ../src/cheese-window.vala:1240
+#: ../src/cheese-window.vala:994
+#| msgid "Take _Multiple Photos"
+msgid "Take Multiple Photos"
+msgstr "拍摄多张照片"
+
+#: ../src/cheese-window.vala:995 ../src/cheese-window.vala:1516
+msgid "Take multiple photos"
+msgstr "拍摄多张照片"
+
+#: ../src/cheese-window.vala:1147
 msgid "No effects found"
 msgstr "未发现效果"
 
+#: ../src/cheese-window.vala:1503
+#| msgid "_Take a Photo"
+msgid "Take a Photo"
+msgstr "拍照"
+
+#: ../src/cheese-window.vala:1515
+msgid "Take _Multiple Photos"
+msgstr "拍摄多张照片(_M)"
+
+#~ msgid "_Cheese"
+#~ msgstr "茄子(_C)"
+
+#~ msgid "_Edit"
+#~ msgstr "编辑(_E)"
+
+#~ msgid "_Contents"
+#~ msgstr "内容(_C)"
+
+#~ msgid "Shutter"
+#~ msgstr "快门"
+
 #~ msgid "Image properties"
 #~ msgstr "图像属性"
 
@@ -567,9 +615,6 @@
 #~ "您应该已经收到这个程序附带的一份 GNU 通用公共许可协议；如果没有，查看 "
 #~ "。\n"
 
-#~ msgid "Fullscreen"
-#~ msgstr "全屏"
-
 #~ msgid "_Delete"
 #~ msgstr "删除(_D)"
 
@@ -579,9 +624,6 @@
 #~ msgid "_Preferences"
 #~ msgstr "首选项(_P)"
 
-#~ msgid "_Quit"
-#~ msgstr "退出(_Q)"
-
 #~ msgid "Next effect"
 #~ msgstr "下一个效果"
 
diff -Nru cheese-3.5.4/po/zh_HK.po cheese-3.5.5/po/zh_HK.po
--- cheese-3.5.4/po/zh_HK.po	2012-01-30 17:35:17.000000000 +0000
+++ cheese-3.5.5/po/zh_HK.po	2012-07-27 15:25:33.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: cheese 3.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-29 23:09+0800\n"
-"PO-Revision-Date: 2012-01-29 23:09+0800\n"
+"POT-Creation-Date: 2012-07-17 14:44+0800\n"
+"PO-Revision-Date: 2012-07-17 14:44+0800\n"
 "Last-Translator: Chao-Hsiung Liao \n"
 "Language-Team: Chinese (Hong Kong) \n"
 "Language: \n"
@@ -17,213 +17,149 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/cheese-about.ui.h:1
-msgid "Cheese Website"
-msgstr "Cheese 網站"
-
-#: ../data/cheese-about.ui.h:2 ../data/cheese.desktop.in.in.h:3
-msgid "Take photos and videos with your webcam, with fun graphical effects"
-msgstr "從你的網絡攝影機擷取相片與影片，並加入有趣的圖片特效"
-
-#: ../data/cheese-about.ui.h:3
-msgid "translator-credits"
-msgstr ""
-"如對翻譯有任何意見，請送一封電子郵件給\n"
-"以下地址，GNOME 翻譯隊伍會盡快回覆你：\n"
-"zh-l10n@lists.linux.org.tw\n"
-"\n"
-"Chao-Hsiung Liao , 2008-2012"
-
 #: ../data/cheese-actions.ui.h:1
-msgid "Move _All to Trash"
-msgstr "全部丟進回收筒(_A)"
+msgid "Share…"
+msgstr "分享…"
 
 #: ../data/cheese-actions.ui.h:2
-msgid "Move to _Trash"
-msgstr "移至回收筒(_T)"
+msgid "Save _As…"
+msgstr "儲存為(_A)…"
 
 #: ../data/cheese-actions.ui.h:3
-msgid "Ne_xt Effects"
-msgstr "下一個效果(_X)"
+msgid "Move to _Trash"
+msgstr "移至回收筒(_T)"
 
 #: ../data/cheese-actions.ui.h:4
-msgid "P_revious Effects"
-msgstr "上一個效果(_R)"
+msgid "Move _All to Trash"
+msgstr "全部丟進回收筒(_A)"
 
 #: ../data/cheese-actions.ui.h:5
-msgid "Record a video"
-msgstr "錄製視像"
+msgid "_Wide Mode"
+msgstr "寬螢幕模式(_W)"
 
 #: ../data/cheese-actions.ui.h:6
-msgid "Save _As…"
-msgstr "儲存為(_A)…"
+msgid "P_revious Effects"
+msgstr "上一個效果(_R)"
 
 #: ../data/cheese-actions.ui.h:7
-msgid "Share…"
-msgstr "分享…"
-
-#: ../data/cheese-actions.ui.h:8
-msgid "Take _Multiple Photos"
-msgstr "拍攝多張相片(_M)"
-
-#: ../data/cheese-actions.ui.h:9 ../data/cheese-main-window.ui.h:7
-#: ../libcheese/cheese-avatar-chooser.c:263
-msgid "Take a photo"
-msgstr "照相"
-
-#: ../data/cheese-actions.ui.h:10
-msgid "Take multiple photos"
-msgstr "拍攝多張相片"
-
-#: ../data/cheese-actions.ui.h:11
-msgid "_About"
-msgstr "關於(_A)"
-
-#: ../data/cheese-actions.ui.h:12
-msgid "_Burst"
-msgstr "連拍(_B)"
-
-#: ../data/cheese-actions.ui.h:13
-msgid "_Cheese"
-msgstr "_Cheese"
-
-#: ../data/cheese-actions.ui.h:14
-msgid "_Contents"
-msgstr "內容(_C)"
-
-#: ../data/cheese-actions.ui.h:15
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../data/cheese-actions.ui.h:16 ../data/cheese-main-window.ui.h:9
-msgid "_Effects"
-msgstr "效果(_E)"
-
-#: ../data/cheese-actions.ui.h:17
-msgid "_Help"
-msgstr "求助(_H)"
-
-#: ../data/cheese-actions.ui.h:18
-msgid "_Photo"
-msgstr "相片(_P)"
-
-#: ../data/cheese-actions.ui.h:19
-msgid "_Record a Video"
-msgstr "錄製視像(_R)"
-
-#: ../data/cheese-actions.ui.h:20 ../data/cheese-main-window.ui.h:11
-msgid "_Take a Photo"
-msgstr "照相(_T)"
-
-#: ../data/cheese-actions.ui.h:21
-msgid "_Video"
-msgstr "影片(_V)"
-
-#: ../data/cheese-actions.ui.h:22
-msgid "_Wide Mode"
-msgstr "寬螢幕模式(_W)"
+msgid "Ne_xt Effects"
+msgstr "下一個效果(_X)"
 
 #: ../data/cheese-main-window.ui.h:1
-msgid "Effects"
-msgstr "效果"
+msgid "Photo mode"
+msgstr "相片模式"
 
 #: ../data/cheese-main-window.ui.h:2
-msgid "Leave fullscreen"
-msgstr "離開全螢幕"
+msgid "Video mode"
+msgstr "視像模式"
 
 #: ../data/cheese-main-window.ui.h:3
-msgid "Next"
-msgstr "下一張"
-
-#: ../data/cheese-main-window.ui.h:4
 msgid "Photo burst mode"
 msgstr "相片連拍模式"
 
+#: ../data/cheese-main-window.ui.h:4 ../libcheese/cheese-avatar-chooser.c:263
+#: ../src/cheese-window.vala:1504
+msgid "Take a photo"
+msgstr "照相"
+
 #: ../data/cheese-main-window.ui.h:5
-msgid "Photo mode"
-msgstr "相片模式"
+msgid "_Take a Photo"
+msgstr "照相(_T)"
 
 #: ../data/cheese-main-window.ui.h:6
 msgid "Previous"
 msgstr "上一張"
 
-#: ../data/cheese-main-window.ui.h:8
-msgid "Video mode"
-msgstr "視像模式"
+#: ../data/cheese-main-window.ui.h:7
+msgid "Effects"
+msgstr "效果"
+
+#: ../data/cheese-main-window.ui.h:8 ../src/cheese-main.vala:107
+msgid "_Effects"
+msgstr "效果(_E)"
+
+#: ../data/cheese-main-window.ui.h:9
+msgid "Next"
+msgstr "下一張"
 
 #: ../data/cheese-main-window.ui.h:10
+msgid "Leave fullscreen"
+msgstr "離開全螢幕"
+
+#: ../data/cheese-main-window.ui.h:11
 msgid "_Leave Fullscreen"
 msgstr "取消全螢幕(_L)"
 
 #: ../data/cheese-prefs.ui.h:1
-msgid "Shutter"
-msgstr "快門"
+msgid "Preferences"
+msgstr "偏好設定"
 
 #: ../data/cheese-prefs.ui.h:2
-msgid "Brightness"
-msgstr "亮度"
+msgid "Device"
+msgstr "裝置"
 
 #: ../data/cheese-prefs.ui.h:3
-msgid "Burst mode"
-msgstr "連拍模式"
+msgid "Photo resolution"
+msgstr "相片解像度"
 
 #: ../data/cheese-prefs.ui.h:4
-msgid "Capture"
-msgstr "擷取"
+msgid "Video resolution"
+msgstr "影片解像度"
 
 #: ../data/cheese-prefs.ui.h:5
-msgid "Contrast"
-msgstr "對比"
+msgid "Webcam"
+msgstr "網絡攝影機"
 
 #: ../data/cheese-prefs.ui.h:6
-msgid "Delay between photos (seconds)"
-msgstr "照片間延遲(秒)"
+msgid "Brightness"
+msgstr "亮度"
 
 #: ../data/cheese-prefs.ui.h:7
-msgid "Device"
-msgstr "裝置"
+msgid "Saturation"
+msgstr "飽和度"
 
 #: ../data/cheese-prefs.ui.h:8
-msgid "Fire _Flash"
-msgstr "閃光(_F)"
-
-#: ../data/cheese-prefs.ui.h:9
 msgid "Hue"
 msgstr "色相"
 
+#: ../data/cheese-prefs.ui.h:9
+msgid "Contrast"
+msgstr "對比"
+
 #: ../data/cheese-prefs.ui.h:10
 msgid "Image"
 msgstr "影像"
 
 #: ../data/cheese-prefs.ui.h:11
-msgid "Number of photos"
-msgstr "照片數量"
+msgid "Shutter"
+msgstr "快門"
 
 #: ../data/cheese-prefs.ui.h:12
-msgid "Photo resolution"
-msgstr "相片解像度"
+msgid "_Countdown"
+msgstr "倒數計時(_C)"
 
 #: ../data/cheese-prefs.ui.h:13
-msgid "Preferences"
-msgstr "偏好設定"
+msgid "Fire _Flash"
+msgstr "閃光(_F)"
 
 #: ../data/cheese-prefs.ui.h:14
-msgid "Saturation"
-msgstr "飽和度"
+msgid "Burst mode"
+msgstr "連拍模式"
 
 #: ../data/cheese-prefs.ui.h:15
-msgid "Video resolution"
-msgstr "影片解像度"
+msgid "Number of photos"
+msgstr "照片數量"
 
 #: ../data/cheese-prefs.ui.h:16
-msgid "Webcam"
-msgstr "網絡攝影機"
+msgid "Delay between photos (seconds)"
+msgstr "照片間延遲(秒)"
 
 #: ../data/cheese-prefs.ui.h:17
-msgid "_Countdown"
-msgstr "倒數計時(_C)"
+msgid "Capture"
+msgstr "擷取"
 
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese-main.vala:67
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese-main.vala:81
+#: ../src/cheese-main.vala:489
 msgid "Cheese"
 msgstr "Cheese"
 
@@ -231,170 +167,174 @@
 msgid "Cheese Webcam Booth"
 msgstr "Cheese 網絡攝影鋪"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:1
-msgid "Adjusts the brightness of the picture coming from the camera"
-msgstr "調整網絡攝影機拍攝相片的亮度"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:2
-msgid "Adjusts the contrast of the picture coming from the camera"
-msgstr "調整網絡攝影機拍攝相片的對比"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:3
-msgid "Adjusts the hue (color tint) of the picture coming from the camera"
-msgstr "調整網絡攝影機拍攝相片的色相(色調)"
+#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-main.vala:484
+msgid "Take photos and videos with your webcam, with fun graphical effects"
+msgstr "從你的網絡攝影機擷取相片與影片，並加入有趣的圖片特效"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:4
-msgid "Adjusts the saturation of the picture coming from the camera"
-msgstr "調整網絡攝影機拍攝相片的飽和度"
+#: ../data/org.gnome.Cheese.gschema.xml.h:1
+msgid "Use a countdown"
+msgstr "使用倒數計時"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:5
-msgid "Camera device string indicator"
-msgstr "網絡攝影機裝置字串標示"
+#: ../data/org.gnome.Cheese.gschema.xml.h:2
+msgid "Set to true to show a countdown before taking a photo"
+msgstr "設為「true」在照相時顯示倒數計時"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:6
+#: ../data/org.gnome.Cheese.gschema.xml.h:3
 msgid "Countdown length"
 msgstr "倒數長度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:7
-msgid ""
-"Defines the path where the photos are stored. If empty, \"XDG_PHOTO/Webcam\" "
-"will be used."
-msgstr "定義相片儲存的路徑。如果保持空白則會使用「XDG_PHOTO/Webcam」。"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:8
-msgid ""
-"Defines the path where the videos are stored. If empty, \"XDG_VIDEO/Webcam\" "
-"will be used."
-msgstr "定義影片儲存的路徑。如果保持空白則會使用「XDG_VIDEO/Webcam」。"
+#: ../data/org.gnome.Cheese.gschema.xml.h:4
+msgid "The duration of the countdown before taking a photo, in seconds"
+msgstr "在照相前倒數計時的時間，以秒計時"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:9
+#: ../data/org.gnome.Cheese.gschema.xml.h:5
 msgid "Fire flash before taking a picture"
 msgstr "拍照前先閃光"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:10
-msgid "If set to true, Cheese will start up in fullscreen mode."
-msgstr "如果設為 true，Cheese 會以全螢幕模式啟動。"
+#: ../data/org.gnome.Cheese.gschema.xml.h:6
+msgid "Set to true to fire a flash when taking a picture"
+msgstr "設為「true」在照相時開啟閃光燈"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:11
+#: ../data/org.gnome.Cheese.gschema.xml.h:7
+msgid "Camera device string indicator"
+msgstr "網絡攝影機裝置字串標示"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:8
 msgid ""
-"If set to true, Cheese will start up in wide mode, with the image collection "
-"placed on the right-hand side. Useful with small screens."
-msgstr "如果設為「true」，Cheese 會以寬螢幕模式啟動，將圖片集放置於右側。在小型螢幕中很有用。"
+"The path to the device node which points to the camera, for example /dev/"
+"video0"
+msgstr "指向網絡攝影機的裝置節點，如 /dev/video0"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:12
+#: ../data/org.gnome.Cheese.gschema.xml.h:9
 msgid "Last selected effect"
 msgstr "上次選取的效果"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:13
+#: ../data/org.gnome.Cheese.gschema.xml.h:10
 msgid "Name of the installed effect that was selected last"
 msgstr "上次選取安裝效果的名稱"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:14
-msgid "Number of photos in burst mode"
-msgstr "連拍模式中照片的數量"
+#: ../data/org.gnome.Cheese.gschema.xml.h:11
+msgid "Photo width"
+msgstr "照片闊度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:15
-msgid "Photo Path"
-msgstr "相片路徑"
+#: ../data/org.gnome.Cheese.gschema.xml.h:12
+msgid "The width of the image captured from the camera, in pixels"
+msgstr "從攝影機擷取的影像闊度，以像素計"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:16
+#: ../data/org.gnome.Cheese.gschema.xml.h:13
 msgid "Photo height"
 msgstr "照片高度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:17
-msgid "Photo width"
-msgstr "照片闊度"
+#: ../data/org.gnome.Cheese.gschema.xml.h:14
+msgid "The height of the image captured from the camera, in pixels"
+msgstr "從攝影機擷取的影像高度，以像素計"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:15
+msgid "Video width"
+msgstr "影片闊度"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:16
+msgid "The width of the video captured from the camera, in pixels"
+msgstr "從攝影機擷取的影片闊度，以像素計"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:17
+msgid "Video height"
+msgstr "影片高度"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:18
+msgid "The height of the video captured from the camera, in pixels"
+msgstr "從攝影機擷取的影片高度，以像素計"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:18
+#: ../data/org.gnome.Cheese.gschema.xml.h:19
 msgid "Picture brightness"
 msgstr "相片亮度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:19
+#: ../data/org.gnome.Cheese.gschema.xml.h:20
+msgid "Adjusts the brightness of the picture coming from the camera"
+msgstr "調整網絡攝影機拍攝相片的亮度"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:21
 msgid "Picture contrast"
 msgstr "相片對比"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:20
-msgid "Picture hue"
-msgstr "相片色相"
+#: ../data/org.gnome.Cheese.gschema.xml.h:22
+msgid "Adjusts the contrast of the picture coming from the camera"
+msgstr "調整網絡攝影機拍攝相片的對比"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:21
+#: ../data/org.gnome.Cheese.gschema.xml.h:23
 msgid "Picture saturation"
 msgstr "相片飽和度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:22
-msgid "Set to true to fire a flash when taking a picture"
-msgstr "設為「true」在照相時開啟閃光燈"
+#: ../data/org.gnome.Cheese.gschema.xml.h:24
+msgid "Adjusts the saturation of the picture coming from the camera"
+msgstr "調整網絡攝影機拍攝相片的飽和度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:23
-msgid "Set to true to show a countdown before taking a photo"
-msgstr "設為「true」在照相時顯示倒數計時"
+#: ../data/org.gnome.Cheese.gschema.xml.h:25
+msgid "Picture hue"
+msgstr "相片色相"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:24
-msgid "The duration of the countdown before taking a photo, in seconds"
-msgstr "在照相前倒數計時的時間，以秒計時"
+#: ../data/org.gnome.Cheese.gschema.xml.h:26
+msgid "Adjusts the hue (color tint) of the picture coming from the camera"
+msgstr "調整網絡攝影機拍攝相片的色相(色調)"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:25
-msgid "The height of the image captured from the camera, in pixels"
-msgstr "從攝影機擷取的影像高度，以像素計"
+#: ../data/org.gnome.Cheese.gschema.xml.h:27
+msgid "Video Path"
+msgstr "影片路徑"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:26
-msgid "The height of the video captured from the camera, in pixels"
-msgstr "從攝影機擷取的影片高度，以像素計"
+#: ../data/org.gnome.Cheese.gschema.xml.h:28
+msgid ""
+"Defines the path where the videos are stored. If empty, \"XDG_VIDEO/Webcam\" "
+"will be used."
+msgstr "定義影片儲存的路徑。如果保持空白則會使用「XDG_VIDEO/Webcam」。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:27
+#: ../data/org.gnome.Cheese.gschema.xml.h:29
+msgid "Photo Path"
+msgstr "相片路徑"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:30
 msgid ""
-"The length of time, in milliseconds, to delay between taking each photo in a "
-"burst sequence of photos. If the burst delay is less than the countdown "
-"duration, the countdown duration will be used instead."
-msgstr "時間的長度，以毫秒計，代表在連拍照片時每張照片延遲的間隔。如果連拍延遲少於倒數時間，會以倒數時間來代替。"
+"Defines the path where the photos are stored. If empty, \"XDG_PHOTO/Webcam\" "
+"will be used."
+msgstr "定義相片儲存的路徑。如果保持空白則會使用「XDG_PHOTO/Webcam」。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:28
-msgid "The number of photos to take in a single burst."
-msgstr "單次爆發所拍攝的照片數量。"
+#: ../data/org.gnome.Cheese.gschema.xml.h:31
+msgid "Whether to start in wide mode"
+msgstr "是否以寬螢幕模式啟動"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:29
+#: ../data/org.gnome.Cheese.gschema.xml.h:32
 msgid ""
-"The path to the device node which points to the camera, for example /dev/"
-"video0"
-msgstr "指向網絡攝影機的裝置節點，如 /dev/video0"
+"If set to true, Cheese will start up in wide mode, with the image collection "
+"placed on the right-hand side. Useful with small screens."
+msgstr "如果設為「true」，Cheese 會以寬螢幕模式啟動，將圖片集放置於右側。在小型螢幕中很有用。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:30
-msgid "The width of the image captured from the camera, in pixels"
-msgstr "從攝影機擷取的影像闊度，以像素計"
+#: ../data/org.gnome.Cheese.gschema.xml.h:33
+msgid "Whether to start in fullscreen"
+msgstr "是否以全螢幕啟動"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:31
-msgid "The width of the video captured from the camera, in pixels"
-msgstr "從攝影機擷取的影片闊度，以像素計"
+#: ../data/org.gnome.Cheese.gschema.xml.h:34
+msgid "If set to true, Cheese will start up in fullscreen mode."
+msgstr "如果設為 true，Cheese 會以全螢幕模式啟動。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:32
+#: ../data/org.gnome.Cheese.gschema.xml.h:35
 msgid "Time between photos in burst mode"
 msgstr "連拍模式中照片間隔"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:33
-msgid "Use a countdown"
-msgstr "使用倒數計時"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:34
-msgid "Video Path"
-msgstr "影片路徑"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:35
-msgid "Video height"
-msgstr "影片高度"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:36
-msgid "Video width"
-msgstr "影片闊度"
+#: ../data/org.gnome.Cheese.gschema.xml.h:36
+msgid ""
+"The length of time, in milliseconds, to delay between taking each photo in a "
+"burst sequence of photos. If the burst delay is less than the countdown "
+"duration, the countdown duration will be used instead."
+msgstr "時間的長度，以毫秒計，代表在連拍照片時每張照片延遲的間隔。如果連拍延遲少於倒數時間，會以倒數時間來代替。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:37
-msgid "Whether to start in fullscreen"
-msgstr "是否以全螢幕啟動"
+#: ../data/org.gnome.Cheese.gschema.xml.h:37
+msgid "Number of photos in burst mode"
+msgstr "連拍模式中照片的數量"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:38
-msgid "Whether to start in wide mode"
-msgstr "是否以寬螢幕模式啟動"
+#: ../data/org.gnome.Cheese.gschema.xml.h:38
+msgid "The number of photos to take in a single burst."
+msgstr "單次爆發所拍攝的照片數量。"
 
-#: ../libcheese/cheese-avatar-chooser.c:138 ../src/cheese-window.vala:850
+#: ../libcheese/cheese-avatar-chooser.c:138 ../src/cheese-window.vala:807
 msgid "Shutter sound"
 msgstr "快門音效"
 
@@ -423,100 +363,198 @@
 msgid "Cancellable initialization not supported"
 msgstr "不支援可取消的初始化"
 
-#: ../libcheese/cheese-camera.c:1489
+#: ../libcheese/cheese-camera.c:430 ../libcheese/cheese-camera.c:1549
+msgid "One or more needed GStreamer elements are missing: "
+msgstr "遺失一或多個需要的 GStreamer 元素："
+
+#: ../libcheese/cheese-camera.c:1509
 #, c-format
 msgid "No device found"
 msgstr "找不到任何裝置"
 
-#: ../libcheese/cheese-camera.c:1539
-msgid "One or more needed GStreamer elements are missing: "
-msgstr "遺失一或多個需要的 GStreamer 元素："
+#. Translators: This is a time format, like "09:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../libcheese/cheese-camera.c:1786
+#, c-format
+msgctxt "time format"
+msgid "%02i:%02i:%02i"
+msgstr "%02i:%02i:%02i"
 
 #: ../src/cheese-effects-manager.vala:50
 msgid "No Effect"
 msgstr "No Effect"
 
-#: ../src/cheese-main.vala:37
+#: ../src/cheese-main.vala:51
 msgid "Start in wide mode"
 msgstr "以寬螢幕模式啟動"
 
-#: ../src/cheese-main.vala:38
+#: ../src/cheese-main.vala:52
 msgid "Device to use as a camera"
 msgstr "做為攝影機的裝置"
 
-#: ../src/cheese-main.vala:38
+#: ../src/cheese-main.vala:52
 msgid "DEVICE"
 msgstr "裝置"
 
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:53
 msgid "Output version information and exit"
 msgstr "輸出版本資訊並離開"
 
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:54
 msgid "Start in fullscreen mode"
 msgstr "以全螢幕模式啟動"
 
-#: ../src/cheese-main.vala:126
+#: ../src/cheese-main.vala:92
+msgid "_Shoot"
+msgstr "拍攝(_S)"
+
+#: ../src/cheese-main.vala:96
+msgid "Mode:"
+msgstr "模式："
+
+#: ../src/cheese-main.vala:97
+msgid "_Photo"
+msgstr "相片(_P)"
+
+#: ../src/cheese-main.vala:98
+msgid "_Video"
+msgstr "影片(_V)"
+
+#: ../src/cheese-main.vala:99
+msgid "_Burst"
+msgstr "連拍(_B)"
+
+#: ../src/cheese-main.vala:102
+msgid "_Fullscreen"
+msgstr "全螢幕(_F)"
+
+#: ../src/cheese-main.vala:110
+msgid "P_references"
+msgstr "偏好設定(_R)"
+
+#: ../src/cheese-main.vala:113
+msgid "_About"
+msgstr "關於(_A)"
+
+#: ../src/cheese-main.vala:114
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: ../src/cheese-main.vala:117
+msgid "_Quit"
+msgstr "結束(_Q)"
+
+#: ../src/cheese-main.vala:177
 msgid "- Take photos and videos from your webcam"
 msgstr "- 從你的網絡攝影機擷取相片和影片"
 
-#: ../src/cheese-main.vala:138
+#: ../src/cheese-main.vala:189
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr "執行「%s --help」可列出完整的命令列選項。\n"
 
-#: ../src/cheese-main.vala:153
+#: ../src/cheese-main.vala:204
 #, c-format
 msgid "Another instance of Cheese is currently running\n"
 msgstr "另一個 Cheese 實體已經在執行\n"
 
-#: ../src/cheese-window.vala:224
+#: ../src/cheese-main.vala:490
+msgid "translator-credits"
+msgstr ""
+"如對翻譯有任何意見，請送一封電子郵件給\n"
+"以下地址，GNOME 翻譯隊伍會盡快回覆你：\n"
+"zh-l10n@lists.linux.org.tw\n"
+"\n"
+"Chao-Hsiung Liao , 2008-2012"
+
+#: ../src/cheese-main.vala:492
+msgid "Cheese Website"
+msgstr "Cheese 網站"
+
+#: ../src/cheese-window.vala:192
 #, c-format
 msgid "Could not open %s"
 msgstr "無法開啟 %s"
 
-#: ../src/cheese-window.vala:252
+#: ../src/cheese-window.vala:220
 #, c-format
 msgid "Are you sure you want to permanently delete the file?"
 msgid_plural "Are you sure you want to permanently delete %d files?"
 msgstr[0] "你確定要永久刪除 %d 個檔案？"
 
-#: ../src/cheese-window.vala:258
+#: ../src/cheese-window.vala:226
 msgid "If you delete an item, it will be permanently lost"
 msgid_plural "If you delete the items, they will be permanently lost"
 msgstr[0] "如果你刪除項目，它會永遠消失"
 
-#: ../src/cheese-window.vala:334
+#: ../src/cheese-window.vala:302
 #, c-format
 msgid "Could not move %s to trash"
 msgstr "無法將 %s 丟進回收筒"
 
 #. Nothing selected.
-#: ../src/cheese-window.vala:413
+#: ../src/cheese-window.vala:451
 msgid "Save File"
 msgstr "儲存檔案"
 
-#: ../src/cheese-window.vala:447
+#: ../src/cheese-window.vala:485
 #, c-format
 msgid "Could not save %s"
 msgstr "無法儲存 %s"
 
-#: ../src/cheese-window.vala:959
+#: ../src/cheese-window.vala:918
 msgid "Stop _Recording"
 msgstr "停止錄製(_R)"
 
-#: ../src/cheese-window.vala:960
+#: ../src/cheese-window.vala:919
 msgid "Stop recording"
 msgstr "停止錄製"
 
-#: ../src/cheese-window.vala:988
+#: ../src/cheese-window.vala:934 ../src/cheese-window.vala:1508
+msgid "Record a Video"
+msgstr "錄製視像"
+
+#: ../src/cheese-window.vala:935 ../src/cheese-window.vala:1509
+msgid "Record a video"
+msgstr "錄製視像"
+
+#. FIXME: Set the effects action to be inactive.
+#: ../src/cheese-window.vala:970
 msgid "Stop _Taking Pictures"
 msgstr "停止拍照(_T)"
 
-#: ../src/cheese-window.vala:989
+#: ../src/cheese-window.vala:971
 msgid "Stop taking pictures"
 msgstr "停止拍照"
 
-#: ../src/cheese-window.vala:1172
+#: ../src/cheese-window.vala:994
+msgid "Take Multiple Photos"
+msgstr "拍攝多張照片"
+
+#: ../src/cheese-window.vala:995 ../src/cheese-window.vala:1516
+msgid "Take multiple photos"
+msgstr "拍攝多張相片"
+
+#: ../src/cheese-window.vala:1147
 msgid "No effects found"
 msgstr "找不到任何效果"
+
+#: ../src/cheese-window.vala:1503
+msgid "Take a Photo"
+msgstr "照相"
+
+#: ../src/cheese-window.vala:1515
+msgid "Take _Multiple Photos"
+msgstr "拍攝多張相片(_M)"
+
+#~ msgid "_Cheese"
+#~ msgstr "_Cheese"
+
+#~ msgid "_Contents"
+#~ msgstr "內容(_C)"
+
+#~ msgid "Shutter"
+#~ msgstr "快門"
diff -Nru cheese-3.5.4/po/zh_TW.po cheese-3.5.5/po/zh_TW.po
--- cheese-3.5.4/po/zh_TW.po	2012-01-30 17:35:17.000000000 +0000
+++ cheese-3.5.5/po/zh_TW.po	2012-07-27 15:25:33.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: cheese 3.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-29 23:09+0800\n"
-"PO-Revision-Date: 2011-03-18 15:55+0800\n"
+"POT-Creation-Date: 2012-07-17 14:44+0800\n"
+"PO-Revision-Date: 2012-07-16 22:49+0800\n"
 "Last-Translator: Chao-Hsiung Liao \n"
 "Language-Team: Chinese/Traditional \n"
 "Language: \n"
@@ -17,213 +17,149 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/cheese-about.ui.h:1
-msgid "Cheese Website"
-msgstr "Cheese 網站"
-
-#: ../data/cheese-about.ui.h:2 ../data/cheese.desktop.in.in.h:3
-msgid "Take photos and videos with your webcam, with fun graphical effects"
-msgstr "從您的網路攝影機擷取相片與影片，並加入有趣的圖片特效"
-
-#: ../data/cheese-about.ui.h:3
-msgid "translator-credits"
-msgstr ""
-"如對翻譯有任何意見，請送一封電子郵件給\n"
-"以下地址，GNOME 翻譯團隊會盡快回覆您：\n"
-"zh-l10n@lists.linux.org.tw\n"
-"\n"
-"Chao-Hsiung Liao , 2008-2012"
-
 #: ../data/cheese-actions.ui.h:1
-msgid "Move _All to Trash"
-msgstr "全部丟進回收筒(_A)"
+msgid "Share…"
+msgstr "分享…"
 
 #: ../data/cheese-actions.ui.h:2
-msgid "Move to _Trash"
-msgstr "移至回收筒(_T)"
+msgid "Save _As…"
+msgstr "儲存為(_A)…"
 
 #: ../data/cheese-actions.ui.h:3
-msgid "Ne_xt Effects"
-msgstr "下一個效果(_X)"
+msgid "Move to _Trash"
+msgstr "移至回收筒(_T)"
 
 #: ../data/cheese-actions.ui.h:4
-msgid "P_revious Effects"
-msgstr "上一個效果(_R)"
+msgid "Move _All to Trash"
+msgstr "全部丟進回收筒(_A)"
 
 #: ../data/cheese-actions.ui.h:5
-msgid "Record a video"
-msgstr "錄製視訊"
+msgid "_Wide Mode"
+msgstr "寬螢幕模式(_W)"
 
 #: ../data/cheese-actions.ui.h:6
-msgid "Save _As…"
-msgstr "儲存為(_A)…"
+msgid "P_revious Effects"
+msgstr "上一個效果(_R)"
 
 #: ../data/cheese-actions.ui.h:7
-msgid "Share…"
-msgstr "分享…"
-
-#: ../data/cheese-actions.ui.h:8
-msgid "Take _Multiple Photos"
-msgstr "拍攝多張相片(_M)"
-
-#: ../data/cheese-actions.ui.h:9 ../data/cheese-main-window.ui.h:7
-#: ../libcheese/cheese-avatar-chooser.c:263
-msgid "Take a photo"
-msgstr "照相"
-
-#: ../data/cheese-actions.ui.h:10
-msgid "Take multiple photos"
-msgstr "拍攝多張相片"
-
-#: ../data/cheese-actions.ui.h:11
-msgid "_About"
-msgstr "關於(_A)"
-
-#: ../data/cheese-actions.ui.h:12
-msgid "_Burst"
-msgstr "連拍(_B)"
-
-#: ../data/cheese-actions.ui.h:13
-msgid "_Cheese"
-msgstr "_Cheese"
-
-#: ../data/cheese-actions.ui.h:14
-msgid "_Contents"
-msgstr "內容(_C)"
-
-#: ../data/cheese-actions.ui.h:15
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../data/cheese-actions.ui.h:16 ../data/cheese-main-window.ui.h:9
-msgid "_Effects"
-msgstr "效果(_E)"
-
-#: ../data/cheese-actions.ui.h:17
-msgid "_Help"
-msgstr "求助(_H)"
-
-#: ../data/cheese-actions.ui.h:18
-msgid "_Photo"
-msgstr "相片(_P)"
-
-#: ../data/cheese-actions.ui.h:19
-msgid "_Record a Video"
-msgstr "錄製視訊(_R)"
-
-#: ../data/cheese-actions.ui.h:20 ../data/cheese-main-window.ui.h:11
-msgid "_Take a Photo"
-msgstr "照相(_T)"
-
-#: ../data/cheese-actions.ui.h:21
-msgid "_Video"
-msgstr "影片(_V)"
-
-#: ../data/cheese-actions.ui.h:22
-msgid "_Wide Mode"
-msgstr "寬螢幕模式(_W)"
+msgid "Ne_xt Effects"
+msgstr "下一個效果(_X)"
 
 #: ../data/cheese-main-window.ui.h:1
-msgid "Effects"
-msgstr "效果"
+msgid "Photo mode"
+msgstr "相片模式"
 
 #: ../data/cheese-main-window.ui.h:2
-msgid "Leave fullscreen"
-msgstr "離開全螢幕"
+msgid "Video mode"
+msgstr "視訊模式"
 
 #: ../data/cheese-main-window.ui.h:3
-msgid "Next"
-msgstr "下一張"
-
-#: ../data/cheese-main-window.ui.h:4
 msgid "Photo burst mode"
 msgstr "相片連拍模式"
 
+#: ../data/cheese-main-window.ui.h:4 ../libcheese/cheese-avatar-chooser.c:263
+#: ../src/cheese-window.vala:1504
+msgid "Take a photo"
+msgstr "照相"
+
 #: ../data/cheese-main-window.ui.h:5
-msgid "Photo mode"
-msgstr "相片模式"
+msgid "_Take a Photo"
+msgstr "照相(_T)"
 
 #: ../data/cheese-main-window.ui.h:6
 msgid "Previous"
 msgstr "上一張"
 
-#: ../data/cheese-main-window.ui.h:8
-msgid "Video mode"
-msgstr "視訊模式"
+#: ../data/cheese-main-window.ui.h:7
+msgid "Effects"
+msgstr "效果"
+
+#: ../data/cheese-main-window.ui.h:8 ../src/cheese-main.vala:107
+msgid "_Effects"
+msgstr "效果(_E)"
+
+#: ../data/cheese-main-window.ui.h:9
+msgid "Next"
+msgstr "下一張"
 
 #: ../data/cheese-main-window.ui.h:10
+msgid "Leave fullscreen"
+msgstr "離開全螢幕"
+
+#: ../data/cheese-main-window.ui.h:11
 msgid "_Leave Fullscreen"
 msgstr "取消全螢幕(_L)"
 
 #: ../data/cheese-prefs.ui.h:1
-msgid "Shutter"
-msgstr "快門"
+msgid "Preferences"
+msgstr "偏好設定"
 
 #: ../data/cheese-prefs.ui.h:2
-msgid "Brightness"
-msgstr "亮度"
+msgid "Device"
+msgstr "裝置"
 
 #: ../data/cheese-prefs.ui.h:3
-msgid "Burst mode"
-msgstr "連拍模式"
+msgid "Photo resolution"
+msgstr "相片解析度"
 
 #: ../data/cheese-prefs.ui.h:4
-msgid "Capture"
-msgstr "擷取"
+msgid "Video resolution"
+msgstr "影片解析度"
 
 #: ../data/cheese-prefs.ui.h:5
-msgid "Contrast"
-msgstr "對比"
+msgid "Webcam"
+msgstr "網路攝影機"
 
 #: ../data/cheese-prefs.ui.h:6
-msgid "Delay between photos (seconds)"
-msgstr "照片間延遲(秒)"
+msgid "Brightness"
+msgstr "亮度"
 
 #: ../data/cheese-prefs.ui.h:7
-msgid "Device"
-msgstr "裝置"
+msgid "Saturation"
+msgstr "飽和度"
 
 #: ../data/cheese-prefs.ui.h:8
-msgid "Fire _Flash"
-msgstr "閃光(_F)"
-
-#: ../data/cheese-prefs.ui.h:9
 msgid "Hue"
 msgstr "色相"
 
+#: ../data/cheese-prefs.ui.h:9
+msgid "Contrast"
+msgstr "對比"
+
 #: ../data/cheese-prefs.ui.h:10
 msgid "Image"
 msgstr "影像"
 
 #: ../data/cheese-prefs.ui.h:11
-msgid "Number of photos"
-msgstr "照片數量"
+msgid "Shutter"
+msgstr "快門"
 
 #: ../data/cheese-prefs.ui.h:12
-msgid "Photo resolution"
-msgstr "相片解析度"
+msgid "_Countdown"
+msgstr "倒數計時(_C)"
 
 #: ../data/cheese-prefs.ui.h:13
-msgid "Preferences"
-msgstr "偏好設定"
+msgid "Fire _Flash"
+msgstr "閃光(_F)"
 
 #: ../data/cheese-prefs.ui.h:14
-msgid "Saturation"
-msgstr "飽和度"
+msgid "Burst mode"
+msgstr "連拍模式"
 
 #: ../data/cheese-prefs.ui.h:15
-msgid "Video resolution"
-msgstr "影片解析度"
+msgid "Number of photos"
+msgstr "照片數量"
 
 #: ../data/cheese-prefs.ui.h:16
-msgid "Webcam"
-msgstr "網路攝影機"
+msgid "Delay between photos (seconds)"
+msgstr "照片間延遲(秒)"
 
 #: ../data/cheese-prefs.ui.h:17
-msgid "_Countdown"
-msgstr "倒數計時(_C)"
+msgid "Capture"
+msgstr "擷取"
 
-#: ../data/cheese.desktop.in.in.h:1 ../src/cheese-main.vala:67
+#: ../data/cheese.desktop.in.in.h:1 ../src/cheese-main.vala:81
+#: ../src/cheese-main.vala:489
 msgid "Cheese"
 msgstr "Cheese"
 
@@ -231,174 +167,178 @@
 msgid "Cheese Webcam Booth"
 msgstr "Cheese 網路攝影鋪"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:1
-msgid "Adjusts the brightness of the picture coming from the camera"
-msgstr "調整網路攝影機拍攝相片的亮度"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:2
-msgid "Adjusts the contrast of the picture coming from the camera"
-msgstr "調整網路攝影機拍攝相片的對比"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:3
-msgid "Adjusts the hue (color tint) of the picture coming from the camera"
-msgstr "調整網路攝影機拍攝相片的色相(色調)"
+#: ../data/cheese.desktop.in.in.h:3 ../src/cheese-main.vala:484
+msgid "Take photos and videos with your webcam, with fun graphical effects"
+msgstr "從您的網路攝影機擷取相片與影片，並加入有趣的圖片特效"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:4
-msgid "Adjusts the saturation of the picture coming from the camera"
-msgstr "調整網路攝影機拍攝相片的飽和度"
+#: ../data/org.gnome.Cheese.gschema.xml.h:1
+msgid "Use a countdown"
+msgstr "使用倒數計時"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:5
-msgid "Camera device string indicator"
-msgstr "網路攝影機裝置字串標示"
+#: ../data/org.gnome.Cheese.gschema.xml.h:2
+msgid "Set to true to show a countdown before taking a photo"
+msgstr "設為「true」在照相時顯示倒數計時"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:6
+#: ../data/org.gnome.Cheese.gschema.xml.h:3
 msgid "Countdown length"
 msgstr "倒數長度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:7
-msgid ""
-"Defines the path where the photos are stored. If empty, \"XDG_PHOTO/Webcam\" "
-"will be used."
-msgstr "定義相片儲存的路徑。如果保持空白則會使用「XDG_PHOTO/Webcam」。"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:8
-msgid ""
-"Defines the path where the videos are stored. If empty, \"XDG_VIDEO/Webcam\" "
-"will be used."
-msgstr "定義影片儲存的路徑。如果保持空白則會使用「XDG_VIDEO/Webcam」。"
+#: ../data/org.gnome.Cheese.gschema.xml.h:4
+msgid "The duration of the countdown before taking a photo, in seconds"
+msgstr "在照相前倒數計時的時間，以秒計時"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:9
+#: ../data/org.gnome.Cheese.gschema.xml.h:5
 msgid "Fire flash before taking a picture"
 msgstr "拍照前先閃光"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:10
-msgid "If set to true, Cheese will start up in fullscreen mode."
-msgstr "如果設為 true，Cheese 會以全螢幕模式啟動。"
+#: ../data/org.gnome.Cheese.gschema.xml.h:6
+msgid "Set to true to fire a flash when taking a picture"
+msgstr "設為「true」在照相時開啟閃光燈"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:7
+msgid "Camera device string indicator"
+msgstr "網路攝影機裝置字串標示"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:11
+#: ../data/org.gnome.Cheese.gschema.xml.h:8
 msgid ""
-"If set to true, Cheese will start up in wide mode, with the image collection "
-"placed on the right-hand side. Useful with small screens."
-msgstr ""
-"如果設為「true」，Cheese 會以寬螢幕模式啟動，將圖片集放置於右側。在小型螢幕中"
-"很有用。"
+"The path to the device node which points to the camera, for example /dev/"
+"video0"
+msgstr "指向網路攝影機的裝置節點，如 /dev/video0"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:12
+#: ../data/org.gnome.Cheese.gschema.xml.h:9
 msgid "Last selected effect"
 msgstr "上次選取的效果"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:13
+#: ../data/org.gnome.Cheese.gschema.xml.h:10
 msgid "Name of the installed effect that was selected last"
 msgstr "上次選取安裝效果的名稱"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:14
-msgid "Number of photos in burst mode"
-msgstr "連拍模式中照片的數量"
+#: ../data/org.gnome.Cheese.gschema.xml.h:11
+msgid "Photo width"
+msgstr "照片寬度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:15
-msgid "Photo Path"
-msgstr "相片路徑"
+#: ../data/org.gnome.Cheese.gschema.xml.h:12
+msgid "The width of the image captured from the camera, in pixels"
+msgstr "從攝影機擷取的影像寬度，以像素計"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:16
+#: ../data/org.gnome.Cheese.gschema.xml.h:13
 msgid "Photo height"
 msgstr "照片高度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:17
-msgid "Photo width"
-msgstr "照片寬度"
+#: ../data/org.gnome.Cheese.gschema.xml.h:14
+msgid "The height of the image captured from the camera, in pixels"
+msgstr "從攝影機擷取的影像高度，以像素計"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:15
+msgid "Video width"
+msgstr "影片寬度"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:16
+msgid "The width of the video captured from the camera, in pixels"
+msgstr "從攝影機擷取的影片寬度，以像素計"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:17
+msgid "Video height"
+msgstr "影片高度"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:18
+msgid "The height of the video captured from the camera, in pixels"
+msgstr "從攝影機擷取的影片高度，以像素計"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:18
+#: ../data/org.gnome.Cheese.gschema.xml.h:19
 msgid "Picture brightness"
 msgstr "相片亮度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:19
+#: ../data/org.gnome.Cheese.gschema.xml.h:20
+msgid "Adjusts the brightness of the picture coming from the camera"
+msgstr "調整網路攝影機拍攝相片的亮度"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:21
 msgid "Picture contrast"
 msgstr "相片對比"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:20
-msgid "Picture hue"
-msgstr "相片色相"
+#: ../data/org.gnome.Cheese.gschema.xml.h:22
+msgid "Adjusts the contrast of the picture coming from the camera"
+msgstr "調整網路攝影機拍攝相片的對比"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:21
+#: ../data/org.gnome.Cheese.gschema.xml.h:23
 msgid "Picture saturation"
 msgstr "相片飽和度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:22
-msgid "Set to true to fire a flash when taking a picture"
-msgstr "設為「true」在照相時開啟閃光燈"
+#: ../data/org.gnome.Cheese.gschema.xml.h:24
+msgid "Adjusts the saturation of the picture coming from the camera"
+msgstr "調整網路攝影機拍攝相片的飽和度"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:23
-msgid "Set to true to show a countdown before taking a photo"
-msgstr "設為「true」在照相時顯示倒數計時"
+#: ../data/org.gnome.Cheese.gschema.xml.h:25
+msgid "Picture hue"
+msgstr "相片色相"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:24
-msgid "The duration of the countdown before taking a photo, in seconds"
-msgstr "在照相前倒數計時的時間，以秒計時"
+#: ../data/org.gnome.Cheese.gschema.xml.h:26
+msgid "Adjusts the hue (color tint) of the picture coming from the camera"
+msgstr "調整網路攝影機拍攝相片的色相(色調)"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:25
-msgid "The height of the image captured from the camera, in pixels"
-msgstr "從攝影機擷取的影像高度，以像素計"
+#: ../data/org.gnome.Cheese.gschema.xml.h:27
+msgid "Video Path"
+msgstr "影片路徑"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:26
-msgid "The height of the video captured from the camera, in pixels"
-msgstr "從攝影機擷取的影片高度，以像素計"
+#: ../data/org.gnome.Cheese.gschema.xml.h:28
+msgid ""
+"Defines the path where the videos are stored. If empty, \"XDG_VIDEO/Webcam\" "
+"will be used."
+msgstr "定義影片儲存的路徑。如果保持空白則會使用「XDG_VIDEO/Webcam」。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:27
+#: ../data/org.gnome.Cheese.gschema.xml.h:29
+msgid "Photo Path"
+msgstr "相片路徑"
+
+#: ../data/org.gnome.Cheese.gschema.xml.h:30
 msgid ""
-"The length of time, in milliseconds, to delay between taking each photo in a "
-"burst sequence of photos. If the burst delay is less than the countdown "
-"duration, the countdown duration will be used instead."
-msgstr ""
-"時間的長度，以毫秒計，代表在連拍照片時每張照片延遲的間隔。如果連拍延遲少於倒"
-"數時間，會以倒數時間來代替。"
+"Defines the path where the photos are stored. If empty, \"XDG_PHOTO/Webcam\" "
+"will be used."
+msgstr "定義相片儲存的路徑。如果保持空白則會使用「XDG_PHOTO/Webcam」。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:28
-msgid "The number of photos to take in a single burst."
-msgstr "單次爆發所拍攝的照片數量。"
+#: ../data/org.gnome.Cheese.gschema.xml.h:31
+msgid "Whether to start in wide mode"
+msgstr "是否以寬螢幕模式啟動"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:29
+#: ../data/org.gnome.Cheese.gschema.xml.h:32
 msgid ""
-"The path to the device node which points to the camera, for example /dev/"
-"video0"
-msgstr "指向網路攝影機的裝置節點，如 /dev/video0"
+"If set to true, Cheese will start up in wide mode, with the image collection "
+"placed on the right-hand side. Useful with small screens."
+msgstr ""
+"如果設為「true」，Cheese 會以寬螢幕模式啟動，將圖片集放置於右側。在小型螢幕中"
+"很有用。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:30
-msgid "The width of the image captured from the camera, in pixels"
-msgstr "從攝影機擷取的影像寬度，以像素計"
+#: ../data/org.gnome.Cheese.gschema.xml.h:33
+msgid "Whether to start in fullscreen"
+msgstr "是否以全螢幕啟動"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:31
-msgid "The width of the video captured from the camera, in pixels"
-msgstr "從攝影機擷取的影片寬度，以像素計"
+#: ../data/org.gnome.Cheese.gschema.xml.h:34
+msgid "If set to true, Cheese will start up in fullscreen mode."
+msgstr "如果設為 true，Cheese 會以全螢幕模式啟動。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:32
+#: ../data/org.gnome.Cheese.gschema.xml.h:35
 msgid "Time between photos in burst mode"
 msgstr "連拍模式中照片間隔"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:33
-msgid "Use a countdown"
-msgstr "使用倒數計時"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:34
-msgid "Video Path"
-msgstr "影片路徑"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:35
-msgid "Video height"
-msgstr "影片高度"
-
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:36
-msgid "Video width"
-msgstr "影片寬度"
+#: ../data/org.gnome.Cheese.gschema.xml.h:36
+msgid ""
+"The length of time, in milliseconds, to delay between taking each photo in a "
+"burst sequence of photos. If the burst delay is less than the countdown "
+"duration, the countdown duration will be used instead."
+msgstr ""
+"時間的長度，以毫秒計，代表在連拍照片時每張照片延遲的間隔。如果連拍延遲少於倒"
+"數時間，會以倒數時間來代替。"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:37
-msgid "Whether to start in fullscreen"
-msgstr "是否以全螢幕啟動"
+#: ../data/org.gnome.Cheese.gschema.xml.h:37
+msgid "Number of photos in burst mode"
+msgstr "連拍模式中照片的數量"
 
-#: ../data/org.gnome.Cheese.gschema.xml.in.h:38
-msgid "Whether to start in wide mode"
-msgstr "是否以寬螢幕模式啟動"
+#: ../data/org.gnome.Cheese.gschema.xml.h:38
+msgid "The number of photos to take in a single burst."
+msgstr "單次爆發所拍攝的照片數量。"
 
-#: ../libcheese/cheese-avatar-chooser.c:138 ../src/cheese-window.vala:850
+#: ../libcheese/cheese-avatar-chooser.c:138 ../src/cheese-window.vala:807
 msgid "Shutter sound"
 msgstr "快門音效"
 
@@ -427,100 +367,198 @@
 msgid "Cancellable initialization not supported"
 msgstr "不支援可取消的初始化"
 
-#: ../libcheese/cheese-camera.c:1489
+#: ../libcheese/cheese-camera.c:430 ../libcheese/cheese-camera.c:1549
+msgid "One or more needed GStreamer elements are missing: "
+msgstr "遺失一或多個需要的 GStreamer 元素："
+
+#: ../libcheese/cheese-camera.c:1509
 #, c-format
 msgid "No device found"
 msgstr "找不到任何裝置"
 
-#: ../libcheese/cheese-camera.c:1539
-msgid "One or more needed GStreamer elements are missing: "
-msgstr "遺失一或多個需要的 GStreamer 元素："
+#. Translators: This is a time format, like "09:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../libcheese/cheese-camera.c:1786
+#, c-format
+msgctxt "time format"
+msgid "%02i:%02i:%02i"
+msgstr "%02i:%02i:%02i"
 
 #: ../src/cheese-effects-manager.vala:50
 msgid "No Effect"
 msgstr "No Effect"
 
-#: ../src/cheese-main.vala:37
+#: ../src/cheese-main.vala:51
 msgid "Start in wide mode"
 msgstr "以寬螢幕模式啟動"
 
-#: ../src/cheese-main.vala:38
+#: ../src/cheese-main.vala:52
 msgid "Device to use as a camera"
 msgstr "做為攝影機的裝置"
 
-#: ../src/cheese-main.vala:38
+#: ../src/cheese-main.vala:52
 msgid "DEVICE"
 msgstr "裝置"
 
-#: ../src/cheese-main.vala:39
+#: ../src/cheese-main.vala:53
 msgid "Output version information and exit"
 msgstr "輸出版本資訊並離開"
 
-#: ../src/cheese-main.vala:40
+#: ../src/cheese-main.vala:54
 msgid "Start in fullscreen mode"
 msgstr "以全螢幕模式啟動"
 
-#: ../src/cheese-main.vala:126
+#: ../src/cheese-main.vala:92
+msgid "_Shoot"
+msgstr "拍攝(_S)"
+
+#: ../src/cheese-main.vala:96
+msgid "Mode:"
+msgstr "模式："
+
+#: ../src/cheese-main.vala:97
+msgid "_Photo"
+msgstr "相片(_P)"
+
+#: ../src/cheese-main.vala:98
+msgid "_Video"
+msgstr "影片(_V)"
+
+#: ../src/cheese-main.vala:99
+msgid "_Burst"
+msgstr "連拍(_B)"
+
+#: ../src/cheese-main.vala:102
+msgid "_Fullscreen"
+msgstr "全螢幕(_F)"
+
+#: ../src/cheese-main.vala:110
+msgid "P_references"
+msgstr "偏好設定(_R)"
+
+#: ../src/cheese-main.vala:113
+msgid "_About"
+msgstr "關於(_A)"
+
+#: ../src/cheese-main.vala:114
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: ../src/cheese-main.vala:117
+msgid "_Quit"
+msgstr "結束(_Q)"
+
+#: ../src/cheese-main.vala:177
 msgid "- Take photos and videos from your webcam"
 msgstr "- 從您的網路攝影機擷取相片和影片"
 
-#: ../src/cheese-main.vala:138
+#: ../src/cheese-main.vala:189
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr "執行「%s --help」可列出完整的命令列選項。\n"
 
-#: ../src/cheese-main.vala:153
+#: ../src/cheese-main.vala:204
 #, c-format
 msgid "Another instance of Cheese is currently running\n"
 msgstr "另一個 Cheese 實體已經在執行\n"
 
-#: ../src/cheese-window.vala:224
+#: ../src/cheese-main.vala:490
+msgid "translator-credits"
+msgstr ""
+"如對翻譯有任何意見，請送一封電子郵件給\n"
+"以下地址，GNOME 翻譯團隊會盡快回覆您：\n"
+"zh-l10n@lists.linux.org.tw\n"
+"\n"
+"Chao-Hsiung Liao , 2008-2012"
+
+#: ../src/cheese-main.vala:492
+msgid "Cheese Website"
+msgstr "Cheese 網站"
+
+#: ../src/cheese-window.vala:192
 #, c-format
 msgid "Could not open %s"
 msgstr "無法開啟 %s"
 
-#: ../src/cheese-window.vala:252
+#: ../src/cheese-window.vala:220
 #, c-format
 msgid "Are you sure you want to permanently delete the file?"
 msgid_plural "Are you sure you want to permanently delete %d files?"
 msgstr[0] "您確定要永久刪除 %d 個檔案？"
 
-#: ../src/cheese-window.vala:258
+#: ../src/cheese-window.vala:226
 msgid "If you delete an item, it will be permanently lost"
 msgid_plural "If you delete the items, they will be permanently lost"
 msgstr[0] "如果您刪除項目，它會永遠消失"
 
-#: ../src/cheese-window.vala:334
+#: ../src/cheese-window.vala:302
 #, c-format
 msgid "Could not move %s to trash"
 msgstr "無法將 %s 丟進回收筒"
 
 #. Nothing selected.
-#: ../src/cheese-window.vala:413
+#: ../src/cheese-window.vala:451
 msgid "Save File"
 msgstr "儲存檔案"
 
-#: ../src/cheese-window.vala:447
+#: ../src/cheese-window.vala:485
 #, c-format
 msgid "Could not save %s"
 msgstr "無法儲存 %s"
 
-#: ../src/cheese-window.vala:959
+#: ../src/cheese-window.vala:918
 msgid "Stop _Recording"
 msgstr "停止錄製(_R)"
 
-#: ../src/cheese-window.vala:960
+#: ../src/cheese-window.vala:919
 msgid "Stop recording"
 msgstr "停止錄製"
 
-#: ../src/cheese-window.vala:988
+#: ../src/cheese-window.vala:934 ../src/cheese-window.vala:1508
+msgid "Record a Video"
+msgstr "錄製視訊"
+
+#: ../src/cheese-window.vala:935 ../src/cheese-window.vala:1509
+msgid "Record a video"
+msgstr "錄製視訊"
+
+#. FIXME: Set the effects action to be inactive.
+#: ../src/cheese-window.vala:970
 msgid "Stop _Taking Pictures"
 msgstr "停止拍照(_T)"
 
-#: ../src/cheese-window.vala:989
+#: ../src/cheese-window.vala:971
 msgid "Stop taking pictures"
 msgstr "停止拍照"
 
-#: ../src/cheese-window.vala:1172
+#: ../src/cheese-window.vala:994
+msgid "Take Multiple Photos"
+msgstr "拍攝多張照片"
+
+#: ../src/cheese-window.vala:995 ../src/cheese-window.vala:1516
+msgid "Take multiple photos"
+msgstr "拍攝多張相片"
+
+#: ../src/cheese-window.vala:1147
 msgid "No effects found"
 msgstr "找不到任何效果"
+
+#: ../src/cheese-window.vala:1503
+msgid "Take a Photo"
+msgstr "照相"
+
+#: ../src/cheese-window.vala:1515
+msgid "Take _Multiple Photos"
+msgstr "拍攝多張相片(_M)"
+
+#~ msgid "_Cheese"
+#~ msgstr "_Cheese"
+
+#~ msgid "_Contents"
+#~ msgstr "內容(_C)"
+
+#~ msgid "Shutter"
+#~ msgstr "快門"
diff -Nru cheese-3.5.4/src/cheese-countdown.c cheese-3.5.5/src/cheese-countdown.c
--- cheese-3.5.4/src/cheese-countdown.c	2012-07-16 19:59:49.000000000 +0000
+++ cheese-3.5.5/src/cheese-countdown.c	2012-07-28 14:48:39.000000000 +0000
@@ -1,4 +1,4 @@
-/* cheese-countdown.c generated by valac 0.16.0, the Vala compiler
+/* cheese-countdown.c generated by valac 0.17.3.12-6a5ea3, the Vala compiler
  * generated from cheese-countdown.vala, do not modify */
 
 /*
@@ -247,7 +247,7 @@
 
 static void cheese_countdown_finalize (GObject* obj) {
 	CheeseCountdown * self;
-	self = CHEESE_COUNTDOWN (obj);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CHEESE_TYPE_COUNTDOWN, CheeseCountdown);
 	_g_object_unref0 (self->priv->countdown_actor);
 	G_OBJECT_CLASS (cheese_countdown_parent_class)->finalize (obj);
 }
diff -Nru cheese-3.5.4/src/cheese-effects-manager.c cheese-3.5.5/src/cheese-effects-manager.c
--- cheese-3.5.4/src/cheese-effects-manager.c	2012-07-16 19:59:49.000000000 +0000
+++ cheese-3.5.5/src/cheese-effects-manager.c	2012-07-28 14:48:39.000000000 +0000
@@ -1,4 +1,4 @@
-/* cheese-effects-manager.c generated by valac 0.16.0, the Vala compiler
+/* cheese-effects-manager.c generated by valac 0.17.3.12-6a5ea3, the Vala compiler
  * generated from cheese-effects-manager.vala, do not modify */
 
 /*
@@ -363,7 +363,7 @@
 
 static void cheese_effects_manager_finalize (GObject* obj) {
 	CheeseEffectsManager * self;
-	self = CHEESE_EFFECTS_MANAGER (obj);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CHEESE_TYPE_EFFECTS_MANAGER, CheeseEffectsManager);
 	_g_object_unref0 (self->effects);
 	G_OBJECT_CLASS (cheese_effects_manager_parent_class)->finalize (obj);
 }
diff -Nru cheese-3.5.4/src/cheese-main.c cheese-3.5.5/src/cheese-main.c
--- cheese-3.5.4/src/cheese-main.c	2012-07-16 19:59:50.000000000 +0000
+++ cheese-3.5.5/src/cheese-main.c	2012-07-28 14:48:39.000000000 +0000
@@ -1,4 +1,4 @@
-/* cheese-main.c generated by valac 0.16.0, the Vala compiler
+/* cheese-main.c generated by valac 0.17.3.12-6a5ea3, the Vala compiler
  * generated from cheese-main.vala, do not modify */
 
 /*
@@ -255,75 +255,74 @@
 		GtkSettings* gtk_settings;
 		GtkSettings* _tmp4_;
 		CheeseMainWindow* _tmp6_;
-		CheeseMainWindow* _tmp7_;
-		const gchar* _tmp8_ = NULL;
-		GtkIconTheme* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_;
-		GMenu* _tmp12_;
+		const gchar* _tmp7_ = NULL;
+		GtkIconTheme* _tmp8_ = NULL;
+		gchar* _tmp9_ = NULL;
+		gchar* _tmp10_;
+		GMenu* _tmp11_;
 		GMenu* menu;
-		GMenu* _tmp13_;
+		GMenu* _tmp12_;
 		GMenu* section;
+		GMenu* _tmp13_;
 		GMenu* _tmp14_;
-		GMenu* _tmp15_;
-		const gchar* _tmp16_ = NULL;
-		GMenuItem* _tmp17_;
+		const gchar* _tmp15_ = NULL;
+		GMenuItem* _tmp16_;
 		GMenuItem* item;
-		GMenuItem* _tmp18_;
-		GMenu* _tmp19_;
-		GMenuItem* _tmp20_;
+		GMenuItem* _tmp17_;
+		GMenu* _tmp18_;
+		GMenuItem* _tmp19_;
+		GMenu* _tmp20_;
 		GMenu* _tmp21_;
-		GMenu* _tmp22_;
-		const gchar* _tmp23_ = NULL;
+		const gchar* _tmp22_ = NULL;
+		GMenu* _tmp23_;
 		GMenu* _tmp24_;
-		GMenu* _tmp25_;
-		const gchar* _tmp26_ = NULL;
-		GMenu* _tmp27_;
-		const gchar* _tmp28_ = NULL;
-		GMenu* _tmp29_;
-		const gchar* _tmp30_ = NULL;
+		const gchar* _tmp25_ = NULL;
+		GMenu* _tmp26_;
+		const gchar* _tmp27_ = NULL;
+		GMenu* _tmp28_;
+		const gchar* _tmp29_ = NULL;
+		GMenu* _tmp30_;
 		GMenu* _tmp31_;
 		GMenu* _tmp32_;
-		GMenu* _tmp33_;
-		const gchar* _tmp34_ = NULL;
+		const gchar* _tmp33_ = NULL;
+		GMenuItem* _tmp34_;
 		GMenuItem* _tmp35_;
-		GMenuItem* _tmp36_;
-		GMenu* _tmp37_;
-		GMenuItem* _tmp38_;
+		GMenu* _tmp36_;
+		GMenuItem* _tmp37_;
+		GMenu* _tmp38_;
 		GMenu* _tmp39_;
 		GMenu* _tmp40_;
 		GMenu* _tmp41_;
-		GMenu* _tmp42_;
-		const gchar* _tmp43_ = NULL;
+		const gchar* _tmp42_ = NULL;
+		GMenu* _tmp43_;
 		GMenu* _tmp44_;
 		GMenu* _tmp45_;
 		GMenu* _tmp46_;
-		GMenu* _tmp47_;
-		const gchar* _tmp48_ = NULL;
+		const gchar* _tmp47_ = NULL;
+		GMenu* _tmp48_;
 		GMenu* _tmp49_;
 		GMenu* _tmp50_;
 		GMenu* _tmp51_;
-		GMenu* _tmp52_;
+		const gchar* _tmp52_ = NULL;
 		const gchar* _tmp53_ = NULL;
-		const gchar* _tmp54_ = NULL;
+		GMenuItem* _tmp54_;
 		GMenuItem* _tmp55_;
-		GMenuItem* _tmp56_;
-		GMenu* _tmp57_;
-		GMenuItem* _tmp58_;
-		const gchar* _tmp59_ = NULL;
+		GMenu* _tmp56_;
+		GMenuItem* _tmp57_;
+		const gchar* _tmp58_ = NULL;
+		GMenuItem* _tmp59_;
 		GMenuItem* _tmp60_;
-		GMenuItem* _tmp61_;
-		GMenu* _tmp62_;
-		GMenuItem* _tmp63_;
-		GMenu* _tmp64_;
+		GMenu* _tmp61_;
+		GMenuItem* _tmp62_;
+		GMenu* _tmp63_;
+		CheeseMainWindow* _tmp64_;
 		CheeseMainWindow* _tmp65_;
-		CheeseMainWindow* _tmp66_;
-		gboolean _tmp67_;
-		gboolean _tmp69_;
-		CheeseMainWindow* _tmp71_;
-		const gchar* _tmp72_;
-		CheeseCamera* _tmp73_;
-		CheesePreferencesDialog* _tmp74_;
+		gboolean _tmp66_;
+		gboolean _tmp68_;
+		CheeseMainWindow* _tmp70_;
+		const gchar* _tmp71_;
+		CheeseCamera* _tmp72_;
+		CheesePreferencesDialog* _tmp73_;
 		_tmp2_ = gtk_settings_get_default ();
 		_tmp3_ = _g_object_ref0 (_tmp2_);
 		gtk_settings = _tmp3_;
@@ -334,136 +333,136 @@
 			g_object_set (_tmp5_, "gtk-application-prefer-dark-theme", TRUE, NULL);
 		}
 		_tmp6_ = cheese_main_window_new ((GtkApplication*) self);
-		_tmp7_ = g_object_ref_sink (_tmp6_);
+		g_object_ref_sink (_tmp6_);
 		_g_object_unref0 (cheese_main_main_window);
-		cheese_main_main_window = _tmp7_;
+		cheese_main_main_window = _tmp6_;
 		g_setenv ("PULSE_PROP_media.role", "production", TRUE);
-		_tmp8_ = _ ("Cheese");
-		g_set_application_name (_tmp8_);
+		_tmp7_ = _ ("Cheese");
+		g_set_application_name (_tmp7_);
 		gtk_window_set_default_icon_name ("cheese");
-		_tmp9_ = gtk_icon_theme_get_default ();
-		_tmp10_ = g_build_filename (PACKAGE_DATADIR, "icons", NULL);
-		_tmp11_ = _tmp10_;
-		gtk_icon_theme_append_search_path (_tmp9_, _tmp11_);
-		_g_free0 (_tmp11_);
-		g_action_map_add_action_entries ((GActionMap*) self, CHEESE_MAIN_action_entries, G_N_ELEMENTS (CHEESE_MAIN_action_entries), self);
+		_tmp8_ = gtk_icon_theme_get_default ();
+		_tmp9_ = g_build_filename (PACKAGE_DATADIR, "icons", NULL);
+		_tmp10_ = _tmp9_;
+		gtk_icon_theme_append_search_path (_tmp8_, _tmp10_);
+		_g_free0 (_tmp10_);
+		g_action_map_add_action_entries ((GActionMap*) self, (GActionEntry*) CHEESE_MAIN_action_entries, G_N_ELEMENTS (CHEESE_MAIN_action_entries), self);
+		_tmp11_ = g_menu_new ();
+		menu = _tmp11_;
 		_tmp12_ = g_menu_new ();
-		menu = _tmp12_;
-		_tmp13_ = g_menu_new ();
-		section = _tmp13_;
-		_tmp14_ = menu;
-		_tmp15_ = section;
-		g_menu_append_section (_tmp14_, NULL, (GMenuModel*) _tmp15_);
-		_tmp16_ = _ ("_Shoot");
-		_tmp17_ = g_menu_item_new (_tmp16_, "app.shoot");
-		item = _tmp17_;
-		_tmp18_ = item;
-		g_menu_item_set_attribute (_tmp18_, "accel", "s", "space", NULL);
-		_tmp19_ = section;
-		_tmp20_ = item;
-		g_menu_append_item (_tmp19_, _tmp20_);
-		_tmp21_ = g_menu_new ();
+		section = _tmp12_;
+		_tmp13_ = menu;
+		_tmp14_ = section;
+		g_menu_append_section (_tmp13_, NULL, (GMenuModel*) _tmp14_);
+		_tmp15_ = _ ("_Shoot");
+		_tmp16_ = g_menu_item_new (_tmp15_, "app.shoot");
+		item = _tmp16_;
+		_tmp17_ = item;
+		g_menu_item_set_attribute (_tmp17_, "accel", "s", "space", NULL);
+		_tmp18_ = section;
+		_tmp19_ = item;
+		g_menu_append_item (_tmp18_, _tmp19_);
+		_tmp20_ = g_menu_new ();
 		_g_object_unref0 (section);
-		section = _tmp21_;
-		_tmp22_ = menu;
-		_tmp23_ = _ ("Mode:");
+		section = _tmp20_;
+		_tmp21_ = menu;
+		_tmp22_ = _ ("Mode:");
+		_tmp23_ = section;
+		g_menu_append_section (_tmp21_, _tmp22_, (GMenuModel*) _tmp23_);
 		_tmp24_ = section;
-		g_menu_append_section (_tmp22_, _tmp23_, (GMenuModel*) _tmp24_);
-		_tmp25_ = section;
-		_tmp26_ = _ ("_Photo");
-		g_menu_append (_tmp25_, _tmp26_, "app.mode::photo");
-		_tmp27_ = section;
-		_tmp28_ = _ ("_Video");
-		g_menu_append (_tmp27_, _tmp28_, "app.mode::video");
-		_tmp29_ = section;
-		_tmp30_ = _ ("_Burst");
-		g_menu_append (_tmp29_, _tmp30_, "app.mode::burst");
-		_tmp31_ = g_menu_new ();
+		_tmp25_ = _ ("_Photo");
+		g_menu_append (_tmp24_, _tmp25_, "app.mode::photo");
+		_tmp26_ = section;
+		_tmp27_ = _ ("_Video");
+		g_menu_append (_tmp26_, _tmp27_, "app.mode::video");
+		_tmp28_ = section;
+		_tmp29_ = _ ("_Burst");
+		g_menu_append (_tmp28_, _tmp29_, "app.mode::burst");
+		_tmp30_ = g_menu_new ();
 		_g_object_unref0 (section);
-		section = _tmp31_;
-		_tmp32_ = menu;
-		_tmp33_ = section;
-		g_menu_append_section (_tmp32_, NULL, (GMenuModel*) _tmp33_);
-		_tmp34_ = _ ("_Fullscreen");
-		_tmp35_ = g_menu_item_new (_tmp34_, "app.fullscreen");
+		section = _tmp30_;
+		_tmp31_ = menu;
+		_tmp32_ = section;
+		g_menu_append_section (_tmp31_, NULL, (GMenuModel*) _tmp32_);
+		_tmp33_ = _ ("_Fullscreen");
+		_tmp34_ = g_menu_item_new (_tmp33_, "app.fullscreen");
 		_g_object_unref0 (item);
-		item = _tmp35_;
-		_tmp36_ = item;
-		g_menu_item_set_attribute (_tmp36_, "accel", "s", "F11", NULL);
-		_tmp37_ = section;
-		_tmp38_ = item;
-		g_menu_append_item (_tmp37_, _tmp38_);
-		_tmp39_ = g_menu_new ();
+		item = _tmp34_;
+		_tmp35_ = item;
+		g_menu_item_set_attribute (_tmp35_, "accel", "s", "F11", NULL);
+		_tmp36_ = section;
+		_tmp37_ = item;
+		g_menu_append_item (_tmp36_, _tmp37_);
+		_tmp38_ = g_menu_new ();
 		_g_object_unref0 (section);
-		section = _tmp39_;
-		_tmp40_ = menu;
+		section = _tmp38_;
+		_tmp39_ = menu;
+		_tmp40_ = section;
+		g_menu_append_section (_tmp39_, NULL, (GMenuModel*) _tmp40_);
 		_tmp41_ = section;
-		g_menu_append_section (_tmp40_, NULL, (GMenuModel*) _tmp41_);
-		_tmp42_ = section;
-		_tmp43_ = _ ("_Effects");
-		g_menu_append (_tmp42_, _tmp43_, "app.effects");
-		_tmp44_ = g_menu_new ();
+		_tmp42_ = _ ("_Effects");
+		g_menu_append (_tmp41_, _tmp42_, "app.effects");
+		_tmp43_ = g_menu_new ();
 		_g_object_unref0 (section);
-		section = _tmp44_;
-		_tmp45_ = menu;
+		section = _tmp43_;
+		_tmp44_ = menu;
+		_tmp45_ = section;
+		g_menu_append_section (_tmp44_, NULL, (GMenuModel*) _tmp45_);
 		_tmp46_ = section;
-		g_menu_append_section (_tmp45_, NULL, (GMenuModel*) _tmp46_);
-		_tmp47_ = section;
-		_tmp48_ = _ ("P_references");
-		g_menu_append (_tmp47_, _tmp48_, "app.preferences");
-		_tmp49_ = g_menu_new ();
+		_tmp47_ = _ ("P_references");
+		g_menu_append (_tmp46_, _tmp47_, "app.preferences");
+		_tmp48_ = g_menu_new ();
 		_g_object_unref0 (section);
-		section = _tmp49_;
-		_tmp50_ = menu;
+		section = _tmp48_;
+		_tmp49_ = menu;
+		_tmp50_ = section;
+		g_menu_append_section (_tmp49_, NULL, (GMenuModel*) _tmp50_);
 		_tmp51_ = section;
-		g_menu_append_section (_tmp50_, NULL, (GMenuModel*) _tmp51_);
-		_tmp52_ = section;
-		_tmp53_ = _ ("_About");
-		g_menu_append (_tmp52_, _tmp53_, "app.about");
-		_tmp54_ = _ ("_Help");
-		_tmp55_ = g_menu_item_new (_tmp54_, "app.help");
+		_tmp52_ = _ ("_About");
+		g_menu_append (_tmp51_, _tmp52_, "app.about");
+		_tmp53_ = _ ("_Help");
+		_tmp54_ = g_menu_item_new (_tmp53_, "app.help");
 		_g_object_unref0 (item);
-		item = _tmp55_;
-		_tmp56_ = item;
-		g_menu_item_set_attribute (_tmp56_, "accel", "s", "F1", NULL);
-		_tmp57_ = section;
-		_tmp58_ = item;
-		g_menu_append_item (_tmp57_, _tmp58_);
-		_tmp59_ = _ ("_Quit");
-		_tmp60_ = g_menu_item_new (_tmp59_, "app.quit");
+		item = _tmp54_;
+		_tmp55_ = item;
+		g_menu_item_set_attribute (_tmp55_, "accel", "s", "F1", NULL);
+		_tmp56_ = section;
+		_tmp57_ = item;
+		g_menu_append_item (_tmp56_, _tmp57_);
+		_tmp58_ = _ ("_Quit");
+		_tmp59_ = g_menu_item_new (_tmp58_, "app.quit");
 		_g_object_unref0 (item);
-		item = _tmp60_;
-		_tmp61_ = item;
-		g_menu_item_set_attribute (_tmp61_, "accel", "s", "q", NULL);
-		_tmp62_ = section;
-		_tmp63_ = item;
-		g_menu_append_item (_tmp62_, _tmp63_);
-		_tmp64_ = menu;
-		gtk_application_set_app_menu ((GtkApplication*) self, (GMenuModel*) _tmp64_);
+		item = _tmp59_;
+		_tmp60_ = item;
+		g_menu_item_set_attribute (_tmp60_, "accel", "s", "q", NULL);
+		_tmp61_ = section;
+		_tmp62_ = item;
+		g_menu_append_item (_tmp61_, _tmp62_);
+		_tmp63_ = menu;
+		gtk_application_set_app_menu ((GtkApplication*) self, (GMenuModel*) _tmp63_);
+		_tmp64_ = cheese_main_main_window;
+		cheese_main_window_setup_ui (_tmp64_);
 		_tmp65_ = cheese_main_main_window;
-		cheese_main_window_setup_ui (_tmp65_);
-		_tmp66_ = cheese_main_main_window;
-		cheese_main_window_start_thumbview_monitors (_tmp66_);
-		_tmp67_ = cheese_main_wide;
-		if (_tmp67_) {
-			CheeseMainWindow* _tmp68_;
-			_tmp68_ = cheese_main_main_window;
-			cheese_main_window_set_startup_wide_mode (_tmp68_);
+		cheese_main_window_start_thumbview_monitors (_tmp65_);
+		_tmp66_ = cheese_main_wide;
+		if (_tmp66_) {
+			CheeseMainWindow* _tmp67_;
+			_tmp67_ = cheese_main_main_window;
+			cheese_main_window_set_startup_wide_mode (_tmp67_);
 		}
-		_tmp69_ = cheese_main_fullscreen;
-		if (_tmp69_) {
-			CheeseMainWindow* _tmp70_;
-			_tmp70_ = cheese_main_main_window;
-			cheese_main_window_set_startup_fullscreen_mode (_tmp70_);
+		_tmp68_ = cheese_main_fullscreen;
+		if (_tmp68_) {
+			CheeseMainWindow* _tmp69_;
+			_tmp69_ = cheese_main_main_window;
+			cheese_main_window_set_startup_fullscreen_mode (_tmp69_);
 		}
-		_tmp71_ = cheese_main_main_window;
-		gtk_widget_show ((GtkWidget*) _tmp71_);
-		_tmp72_ = cheese_main_device;
-		cheese_main_setup_camera (self, _tmp72_);
-		_tmp73_ = self->priv->camera;
-		_tmp74_ = cheese_preferences_dialog_new (_tmp73_);
+		_tmp70_ = cheese_main_main_window;
+		gtk_widget_show ((GtkWidget*) _tmp70_);
+		_tmp71_ = cheese_main_device;
+		cheese_main_setup_camera (self, _tmp71_);
+		_tmp72_ = self->priv->camera;
+		_tmp73_ = cheese_preferences_dialog_new (_tmp72_);
 		_g_object_unref0 (self->priv->preferences_dialog);
-		self->priv->preferences_dialog = _tmp74_;
+		self->priv->preferences_dialog = _tmp73_;
 		_g_object_unref0 (item);
 		_g_object_unref0 (section);
 		_g_object_unref0 (menu);
@@ -935,7 +934,8 @@
 	_tmp2_ = action;
 	_tmp3_ = g_variant_get_boolean (state);
 	_tmp4_ = g_variant_new_boolean (!_tmp3_);
-	_tmp5_ = g_variant_ref_sink (_tmp4_);
+	g_variant_ref_sink (_tmp4_);
+	_tmp5_ = _tmp4_;
 	g_signal_emit_by_name (_tmp2_, "change-state", _tmp5_);
 	_g_variant_unref0 (_tmp5_);
 	_g_variant_unref0 (state);
@@ -1299,7 +1299,7 @@
 
 static void cheese_main_finalize (GObject* obj) {
 	CheeseMain * self;
-	self = CHEESE_MAIN (obj);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CHEESE_TYPE_MAIN, CheeseMain);
 	_g_object_unref0 (self->priv->camera);
 	_g_object_unref0 (self->priv->preferences_dialog);
 	G_OBJECT_CLASS (cheese_main_parent_class)->finalize (obj);
diff -Nru cheese-3.5.4/src/cheese-preferences.c cheese-3.5.5/src/cheese-preferences.c
--- cheese-3.5.4/src/cheese-preferences.c	2012-07-16 19:59:49.000000000 +0000
+++ cheese-3.5.5/src/cheese-preferences.c	2012-07-28 14:48:39.000000000 +0000
@@ -1,4 +1,4 @@
-/* cheese-preferences.c generated by valac 0.16.0, the Vala compiler
+/* cheese-preferences.c generated by valac 0.17.3.12-6a5ea3, the Vala compiler
  * generated from cheese-preferences.vala, do not modify */
 
 /*
@@ -242,39 +242,39 @@
 		return NULL;
 	}
 	_tmp7_ = gtk_builder_get_object (builder, "cheese_prefs_dialog");
-	_tmp8_ = _g_object_ref0 (GTK_IS_DIALOG (_tmp7_) ? ((GtkDialog*) _tmp7_) : NULL);
+	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, GTK_TYPE_DIALOG) ? ((GtkDialog*) _tmp7_) : NULL);
 	_g_object_unref0 (self->priv->dialog);
 	self->priv->dialog = _tmp8_;
 	_tmp9_ = gtk_builder_get_object (builder, "brightness_adjustment");
-	_tmp10_ = _g_object_ref0 (GTK_IS_ADJUSTMENT (_tmp9_) ? ((GtkAdjustment*) _tmp9_) : NULL);
+	_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) _tmp9_) : NULL);
 	_g_object_unref0 (self->priv->brightness_adjustment);
 	self->priv->brightness_adjustment = _tmp10_;
 	_tmp11_ = gtk_builder_get_object (builder, "contrast_adjustment");
-	_tmp12_ = _g_object_ref0 (GTK_IS_ADJUSTMENT (GTK_IS_ADJUSTMENT (GTK_IS_ADJUSTMENT (GTK_IS_ADJUSTMENT (_tmp11_) ? ((GtkAdjustment*) _tmp11_) : NULL) ? ((GtkAdjustment*) (GTK_IS_ADJUSTMENT (_tmp11_) ? ((GtkAdjustment*) _tmp11_) : NULL)) : NULL) ? ((GtkAdjustment*) (GTK_IS_ADJUSTMENT (GTK_IS_ADJUSTMENT (_tmp11_) ? ((GtkAdjustment*) _tmp11_) : NULL) ? ((GtkAdjustment*) (GTK_IS_ADJUSTMENT (_tmp11_) ? ((GtkAdjustment*) _tmp11_) : NULL)) : NULL)) : NULL) ? ((GtkAdjustment*) (GTK_IS_ADJUSTMENT (GTK_IS_ADJUSTMENT (GTK_IS_ADJUSTMENT (_tmp11_) ? ((GtkAdjustment*) _tmp11_) : NULL) ? ((GtkAdjustment*) (GTK_IS_ADJUSTMENT (_tmp11_) ? ((GtkAdjustment*) _tmp11_) : NULL)) : NULL) ? ((GtkAdjustment*) (GTK_IS_ADJUSTMENT (GTK_IS_ADJUSTMENT (_tmp11_) ? ((GtkAdjustment*) _tmp11_) : NULL) ? ((GtkAdjustment*) (GTK_IS_ADJUSTMENT (_tmp11_) ? ((GtkAdjustment*) _tmp11_) : NULL)) : NULL)) : NULL)) : NULL);
+	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (G_TYPE_CHECK_INSTANCE_TYPE (G_TYPE_CHECK_INSTANCE_TYPE (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) _tmp11_) : NULL, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) _tmp11_) : NULL)) : NULL, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) (G_TYPE_CHECK_INSTANCE_TYPE (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) _tmp11_) : NULL, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) _tmp11_) : NULL)) : NULL)) : NULL, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) (G_TYPE_CHECK_INSTANCE_TYPE (G_TYPE_CHECK_INSTANCE_TYPE (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) _tmp11_) : NULL, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) _tmp11_) : NULL)) : NULL, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) (G_TYPE_CHECK_INSTANCE_TYPE (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) _tmp11_) : NULL, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) _tmp11_) : NULL)) : NULL)) : NULL)) : NULL);
 	_g_object_unref0 (self->priv->contrast_adjustment);
 	self->priv->contrast_adjustment = _tmp12_;
 	_tmp13_ = gtk_builder_get_object (builder, "hue_adjustment");
-	_tmp14_ = _g_object_ref0 (GTK_IS_ADJUSTMENT (_tmp13_) ? ((GtkAdjustment*) _tmp13_) : NULL);
+	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) _tmp13_) : NULL);
 	_g_object_unref0 (self->priv->hue_adjustment);
 	self->priv->hue_adjustment = _tmp14_;
 	_tmp15_ = gtk_builder_get_object (builder, "saturation_adjustment");
-	_tmp16_ = _g_object_ref0 (GTK_IS_ADJUSTMENT (_tmp15_) ? ((GtkAdjustment*) _tmp15_) : NULL);
+	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, GTK_TYPE_ADJUSTMENT) ? ((GtkAdjustment*) _tmp15_) : NULL);
 	_g_object_unref0 (self->priv->saturation_adjustment);
 	self->priv->saturation_adjustment = _tmp16_;
 	_tmp17_ = gtk_builder_get_object (builder, "brightness_scale");
-	_tmp18_ = _g_object_ref0 (GTK_IS_SCALE (_tmp17_) ? ((GtkScale*) _tmp17_) : NULL);
+	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, GTK_TYPE_SCALE) ? ((GtkScale*) _tmp17_) : NULL);
 	_g_object_unref0 (self->priv->brightness_scale);
 	self->priv->brightness_scale = _tmp18_;
 	_tmp19_ = gtk_builder_get_object (builder, "contrast_scale");
-	_tmp20_ = _g_object_ref0 (GTK_IS_SCALE (_tmp19_) ? ((GtkScale*) _tmp19_) : NULL);
+	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, GTK_TYPE_SCALE) ? ((GtkScale*) _tmp19_) : NULL);
 	_g_object_unref0 (self->priv->contrast_scale);
 	self->priv->contrast_scale = _tmp20_;
 	_tmp21_ = gtk_builder_get_object (builder, "hue_scale");
-	_tmp22_ = _g_object_ref0 (GTK_IS_SCALE (_tmp21_) ? ((GtkScale*) _tmp21_) : NULL);
+	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, GTK_TYPE_SCALE) ? ((GtkScale*) _tmp21_) : NULL);
 	_g_object_unref0 (self->priv->hue_scale);
 	self->priv->hue_scale = _tmp22_;
 	_tmp23_ = gtk_builder_get_object (builder, "saturation_scale");
-	_tmp24_ = _g_object_ref0 (GTK_IS_SCALE (_tmp23_) ? ((GtkScale*) _tmp23_) : NULL);
+	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, GTK_TYPE_SCALE) ? ((GtkScale*) _tmp23_) : NULL);
 	_g_object_unref0 (self->priv->saturation_scale);
 	self->priv->saturation_scale = _tmp24_;
 	_tmp25_ = self->priv->brightness_scale;
@@ -286,31 +286,31 @@
 	_tmp28_ = self->priv->saturation_scale;
 	gtk_scale_add_mark (_tmp28_, (gdouble) 1, GTK_POS_BOTTOM, NULL);
 	_tmp29_ = gtk_builder_get_object (builder, "photo_resolution_combo_box");
-	_tmp30_ = _g_object_ref0 (GTK_IS_COMBO_BOX (_tmp29_) ? ((GtkComboBox*) _tmp29_) : NULL);
+	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, GTK_TYPE_COMBO_BOX) ? ((GtkComboBox*) _tmp29_) : NULL);
 	_g_object_unref0 (self->priv->photo_resolution_combo);
 	self->priv->photo_resolution_combo = _tmp30_;
 	_tmp31_ = gtk_builder_get_object (builder, "video_resolution_combo_box");
-	_tmp32_ = _g_object_ref0 (GTK_IS_COMBO_BOX (_tmp31_) ? ((GtkComboBox*) _tmp31_) : NULL);
+	_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, GTK_TYPE_COMBO_BOX) ? ((GtkComboBox*) _tmp31_) : NULL);
 	_g_object_unref0 (self->priv->video_resolution_combo);
 	self->priv->video_resolution_combo = _tmp32_;
 	_tmp33_ = gtk_builder_get_object (builder, "camera_combo_box");
-	_tmp34_ = _g_object_ref0 (GTK_IS_COMBO_BOX (_tmp33_) ? ((GtkComboBox*) _tmp33_) : NULL);
+	_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp33_, GTK_TYPE_COMBO_BOX) ? ((GtkComboBox*) _tmp33_) : NULL);
 	_g_object_unref0 (self->priv->source_combo);
 	self->priv->source_combo = _tmp34_;
 	_tmp35_ = gtk_builder_get_object (builder, "burst_repeat");
-	_tmp36_ = _g_object_ref0 (GTK_IS_SPIN_BUTTON (_tmp35_) ? ((GtkSpinButton*) _tmp35_) : NULL);
+	_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, GTK_TYPE_SPIN_BUTTON) ? ((GtkSpinButton*) _tmp35_) : NULL);
 	_g_object_unref0 (self->priv->burst_repeat_spin);
 	self->priv->burst_repeat_spin = _tmp36_;
 	_tmp37_ = gtk_builder_get_object (builder, "burst_delay");
-	_tmp38_ = _g_object_ref0 (GTK_IS_SPIN_BUTTON (_tmp37_) ? ((GtkSpinButton*) _tmp37_) : NULL);
+	_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, GTK_TYPE_SPIN_BUTTON) ? ((GtkSpinButton*) _tmp37_) : NULL);
 	_g_object_unref0 (self->priv->burst_delay_spin);
 	self->priv->burst_delay_spin = _tmp38_;
 	_tmp39_ = gtk_builder_get_object (builder, "countdown");
-	_tmp40_ = _g_object_ref0 (GTK_IS_CHECK_BUTTON (_tmp39_) ? ((GtkCheckButton*) _tmp39_) : NULL);
+	_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, GTK_TYPE_CHECK_BUTTON) ? ((GtkCheckButton*) _tmp39_) : NULL);
 	_g_object_unref0 (self->priv->countdown_check);
 	self->priv->countdown_check = _tmp40_;
 	_tmp41_ = gtk_builder_get_object (builder, "flash");
-	_tmp42_ = _g_object_ref0 (GTK_IS_CHECK_BUTTON (_tmp41_) ? ((GtkCheckButton*) _tmp41_) : NULL);
+	_tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, GTK_TYPE_CHECK_BUTTON) ? ((GtkCheckButton*) _tmp41_) : NULL);
 	_g_object_unref0 (self->priv->flash_check);
 	self->priv->flash_check = _tmp42_;
 	cheese_preferences_dialog_setup_combo_box_models (self);
@@ -334,30 +334,29 @@
    */
 static void cheese_preferences_dialog_setup_combo_box_models (CheesePreferencesDialog* self) {
 	GtkCellRendererText* _tmp0_;
-	GtkCellRendererText* _tmp1_;
 	GtkCellRendererText* cell;
+	GtkComboBox* _tmp1_;
 	GtkComboBox* _tmp2_;
 	GtkComboBox* _tmp3_;
 	GtkComboBox* _tmp4_;
 	GtkComboBox* _tmp5_;
 	GtkComboBox* _tmp6_;
-	GtkComboBox* _tmp7_;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-	_tmp1_ = g_object_ref_sink (_tmp0_);
-	cell = _tmp1_;
+	g_object_ref_sink (_tmp0_);
+	cell = _tmp0_;
+	_tmp1_ = self->priv->photo_resolution_combo;
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp1_, (GtkCellRenderer*) cell, FALSE);
 	_tmp2_ = self->priv->photo_resolution_combo;
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp2_, (GtkCellRenderer*) cell, FALSE);
-	_tmp3_ = self->priv->photo_resolution_combo;
-	gtk_cell_layout_set_attributes ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) cell, "text", 0, NULL);
+	gtk_cell_layout_set_attributes ((GtkCellLayout*) _tmp2_, (GtkCellRenderer*) cell, "text", 0, NULL);
+	_tmp3_ = self->priv->video_resolution_combo;
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) cell, FALSE);
 	_tmp4_ = self->priv->video_resolution_combo;
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp4_, (GtkCellRenderer*) cell, FALSE);
-	_tmp5_ = self->priv->video_resolution_combo;
-	gtk_cell_layout_set_attributes ((GtkCellLayout*) _tmp5_, (GtkCellRenderer*) cell, "text", 0, NULL);
+	gtk_cell_layout_set_attributes ((GtkCellLayout*) _tmp4_, (GtkCellRenderer*) cell, "text", 0, NULL);
+	_tmp5_ = self->priv->source_combo;
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp5_, (GtkCellRenderer*) cell, FALSE);
 	_tmp6_ = self->priv->source_combo;
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp6_, (GtkCellRenderer*) cell, FALSE);
-	_tmp7_ = self->priv->source_combo;
-	gtk_cell_layout_set_attributes ((GtkCellLayout*) _tmp7_, (GtkCellRenderer*) cell, "text", 0, NULL);
+	gtk_cell_layout_set_attributes ((GtkCellLayout*) _tmp6_, (GtkCellRenderer*) cell, "text", 0, NULL);
 	_g_object_unref0 (cell);
 }
 
@@ -1173,7 +1172,7 @@
 	GtkListStore* _tmp15_;
 	self = _data2_->self;
 	_tmp0_ = device;
-	_tmp1_ = _g_object_ref0 (CHEESE_CAMERA_DEVICE (_tmp0_));
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CHEESE_TYPE_CAMERA_DEVICE, CheeseCameraDevice));
 	old_device = _tmp1_;
 	_tmp2_ = self->priv->camera_model;
 	_tmp3_ = _data2_->iter;
@@ -1245,7 +1244,7 @@
 		_tmp7_ = devices;
 		_tmp8_ = _tmp7_->len;
 		_tmp9_ = g_ptr_array_index (_tmp6_, _tmp8_ - 1);
-		_tmp10_ = _g_object_ref0 (CHEESE_CAMERA_DEVICE (_tmp9_));
+		_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, CHEESE_TYPE_CAMERA_DEVICE, CheeseCameraDevice));
 		_g_object_unref0 (dev);
 		dev = _tmp10_;
 		_tmp11_ = dev;
@@ -1343,7 +1342,7 @@
 	const gchar* _tmp21_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = device;
-	_tmp1_ = _g_object_ref0 (CHEESE_CAMERA_DEVICE (_tmp0_));
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CHEESE_TYPE_CAMERA_DEVICE, CheeseCameraDevice));
 	dev = _tmp1_;
 	_tmp2_ = self->priv->camera_model;
 	gtk_list_store_append (_tmp2_, &_tmp3_);
@@ -1512,7 +1511,7 @@
 
 static void cheese_preferences_dialog_finalize (GObject* obj) {
 	CheesePreferencesDialog * self;
-	self = CHEESE_PREFERENCES_DIALOG (obj);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CHEESE_TYPE_PREFERENCES_DIALOG, CheesePreferencesDialog);
 	_g_object_unref0 (self->priv->camera);
 	_g_object_unref0 (self->priv->settings);
 	_g_object_unref0 (self->priv->dialog);
diff -Nru cheese-3.5.4/src/cheese-shareable-media.c cheese-3.5.5/src/cheese-shareable-media.c
--- cheese-3.5.4/src/cheese-shareable-media.c	2012-07-16 19:59:50.000000000 +0000
+++ cheese-3.5.5/src/cheese-shareable-media.c	2012-07-28 14:48:39.000000000 +0000
@@ -1,4 +1,4 @@
-/* cheese-shareable-media.c generated by valac 0.16.0, the Vala compiler
+/* cheese-shareable-media.c generated by valac 0.17.3.12-6a5ea3, the Vala compiler
  * generated from cheese-shareable-media.vala, do not modify */
 
 /*
@@ -372,7 +372,7 @@
 
 static void cheese_shareable_media_finalize (GObject* obj) {
 	CheeseShareableMedia * self;
-	self = CHEESE_SHAREABLE_MEDIA (obj);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CHEESE_TYPE_SHAREABLE_MEDIA, CheeseShareableMedia);
 	_g_object_unref0 (self->priv->window);
 	G_OBJECT_CLASS (cheese_shareable_media_parent_class)->finalize (obj);
 }
diff -Nru cheese-3.5.4/src/cheese-window.c cheese-3.5.5/src/cheese-window.c
--- cheese-3.5.4/src/cheese-window.c	2012-07-16 19:59:50.000000000 +0000
+++ cheese-3.5.5/src/cheese-window.c	2012-07-28 14:48:39.000000000 +0000
@@ -1,4 +1,4 @@
-/* cheese-window.c generated by valac 0.16.0, the Vala compiler
+/* cheese-window.c generated by valac 0.17.3.12-6a5ea3, the Vala compiler
  * generated from cheese-window.vala, do not modify */
 
 /*
@@ -800,21 +800,20 @@
 		const gchar* _tmp11_ = NULL;
 		const gchar* _tmp12_;
 		GtkMessageDialog* _tmp13_;
-		GtkMessageDialog* _tmp14_;
 		GtkMessageDialog* error_dialog;
+		GtkMessageDialog* _tmp14_;
 		GtkMessageDialog* _tmp15_;
-		GtkMessageDialog* _tmp16_;
 		err = _inner_error_;
 		_inner_error_ = NULL;
 		_tmp11_ = _ ("Could not open %s");
 		_tmp12_ = filename;
 		_tmp13_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _tmp11_, _tmp12_);
-		_tmp14_ = g_object_ref_sink (_tmp13_);
-		error_dialog = _tmp14_;
+		g_object_ref_sink (_tmp13_);
+		error_dialog = _tmp13_;
+		_tmp14_ = error_dialog;
+		gtk_dialog_run ((GtkDialog*) _tmp14_);
 		_tmp15_ = error_dialog;
-		gtk_dialog_run ((GtkDialog*) _tmp15_);
-		_tmp16_ = error_dialog;
-		gtk_widget_destroy ((GtkWidget*) _tmp16_);
+		gtk_widget_destroy ((GtkWidget*) _tmp15_);
 		_g_object_unref0 (error_dialog);
 		_g_error_free0 (err);
 	}
@@ -865,17 +864,16 @@
 	const gchar* _tmp5_ = NULL;
 	guint _tmp6_;
 	GtkMessageDialog* _tmp7_;
-	GtkMessageDialog* _tmp8_;
 	GtkMessageDialog* confirmation_dialog;
+	GtkMessageDialog* _tmp8_;
 	GtkMessageDialog* _tmp9_;
 	GtkMessageDialog* _tmp10_;
-	GtkMessageDialog* _tmp11_;
-	guint _tmp12_;
-	const gchar* _tmp13_ = NULL;
-	GtkMessageDialog* _tmp14_;
-	gint _tmp15_ = 0;
-	gint _tmp16_;
-	GtkMessageDialog* _tmp38_;
+	guint _tmp11_;
+	const gchar* _tmp12_ = NULL;
+	GtkMessageDialog* _tmp13_;
+	gint _tmp14_ = 0;
+	gint _tmp15_;
+	GtkMessageDialog* _tmp36_;
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (action != NULL);
@@ -890,45 +888,45 @@
 	_tmp5_ = ngettext ("Are you sure you want to permanently delete the file?", "Are you sure you want to permanently delete %d files?", (gulong) _tmp4_);
 	_tmp6_ = files_length;
 	_tmp7_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup ((GtkWindow*) self, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _tmp5_, _tmp6_);
-	_tmp8_ = g_object_ref_sink (_tmp7_);
-	confirmation_dialog = _tmp8_;
+	g_object_ref_sink (_tmp7_);
+	confirmation_dialog = _tmp7_;
+	_tmp8_ = confirmation_dialog;
+	gtk_dialog_add_button ((GtkDialog*) _tmp8_, GTK_STOCK_CANCEL, (gint) GTK_RESPONSE_CANCEL);
 	_tmp9_ = confirmation_dialog;
-	gtk_dialog_add_button ((GtkDialog*) _tmp9_, GTK_STOCK_CANCEL, (gint) GTK_RESPONSE_CANCEL);
+	gtk_dialog_add_button ((GtkDialog*) _tmp9_, GTK_STOCK_DELETE, (gint) GTK_RESPONSE_ACCEPT);
 	_tmp10_ = confirmation_dialog;
-	gtk_dialog_add_button ((GtkDialog*) _tmp10_, GTK_STOCK_DELETE, (gint) GTK_RESPONSE_ACCEPT);
-	_tmp11_ = confirmation_dialog;
-	_tmp12_ = files_length;
-	_tmp13_ = ngettext ("If you delete an item, it will be permanently lost", "If you delete the items, they will be permanently lost", (gulong) _tmp12_);
-	gtk_message_dialog_format_secondary_text (_tmp11_, "%s", _tmp13_);
-	_tmp14_ = confirmation_dialog;
-	_tmp15_ = gtk_dialog_run ((GtkDialog*) _tmp14_);
-	response = _tmp15_;
-	_tmp16_ = response;
-	if (_tmp16_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-		GList* _tmp17_;
-		_tmp17_ = files;
+	_tmp11_ = files_length;
+	_tmp12_ = ngettext ("If you delete an item, it will be permanently lost", "If you delete the items, they will be permanently lost", (gulong) _tmp11_);
+	gtk_message_dialog_format_secondary_text (_tmp10_, "%s", _tmp12_);
+	_tmp13_ = confirmation_dialog;
+	_tmp14_ = gtk_dialog_run ((GtkDialog*) _tmp13_);
+	response = _tmp14_;
+	_tmp15_ = response;
+	if (_tmp15_ == ((gint) GTK_RESPONSE_ACCEPT)) {
+		GList* _tmp16_;
+		_tmp16_ = files;
 		{
 			GList* file_collection = NULL;
 			GList* file_it = NULL;
-			file_collection = _tmp17_;
+			file_collection = _tmp16_;
 			for (file_it = file_collection; file_it != NULL; file_it = file_it->next) {
-				GFile* _tmp18_;
+				GFile* _tmp17_;
 				GFile* file = NULL;
-				_tmp18_ = _g_object_ref0 ((GFile*) file_it->data);
-				file = _tmp18_;
+				_tmp17_ = _g_object_ref0 ((GFile*) file_it->data);
+				file = _tmp17_;
 				{
-					GFile* _tmp19_;
-					_tmp19_ = file;
-					if (_tmp19_ == NULL) {
+					GFile* _tmp18_;
+					_tmp18_ = file;
+					if (_tmp18_ == NULL) {
 						_g_object_unref0 (file);
 						_g_object_unref0 (confirmation_dialog);
 						__g_list_free__g_object_unref0_0 (files);
 						return;
 					}
 					{
-						GFile* _tmp20_;
-						_tmp20_ = file;
-						g_file_delete (_tmp20_, NULL, &_inner_error_);
+						GFile* _tmp19_;
+						_tmp19_ = file;
+						g_file_delete (_tmp19_, NULL, &_inner_error_);
 						if (_inner_error_ != NULL) {
 							goto __catch3_g_error;
 						}
@@ -937,62 +935,61 @@
 					__catch3_g_error:
 					{
 						GError* err = NULL;
-						GError* _tmp21_;
-						const gchar* _tmp22_;
-						gboolean _tmp23_;
+						GError* _tmp20_;
+						const gchar* _tmp21_;
+						gboolean _tmp22_;
 						err = _inner_error_;
 						_inner_error_ = NULL;
-						_tmp21_ = err;
-						_tmp22_ = _tmp21_->message;
-						g_warning ("cheese-window.vala:244: Unable to delete file: %s", _tmp22_);
-						_tmp23_ = skip_all_errors;
-						if (!_tmp23_) {
-							GFile* _tmp24_;
-							gchar* _tmp25_ = NULL;
-							gchar* _tmp26_;
+						_tmp20_ = err;
+						_tmp21_ = _tmp20_->message;
+						g_warning ("cheese-window.vala:244: Unable to delete file: %s", _tmp21_);
+						_tmp22_ = skip_all_errors;
+						if (!_tmp22_) {
+							GFile* _tmp23_;
+							gchar* _tmp24_ = NULL;
+							gchar* _tmp25_;
+							GtkMessageDialog* _tmp26_;
 							GtkMessageDialog* _tmp27_;
+							GtkMessageDialog* error_dialog;
 							GtkMessageDialog* _tmp28_;
 							GtkMessageDialog* _tmp29_;
-							GtkMessageDialog* error_dialog;
 							GtkMessageDialog* _tmp30_;
 							GtkMessageDialog* _tmp31_;
-							GtkMessageDialog* _tmp32_;
-							GtkMessageDialog* _tmp33_;
-							gint _tmp34_ = 0;
-							gint _tmp35_;
-							GtkMessageDialog* _tmp37_;
-							_tmp24_ = file;
-							_tmp25_ = g_file_get_path (_tmp24_);
-							_tmp26_ = _tmp25_;
-							_tmp27_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE, "Could not delete %s", _tmp26_);
-							_tmp28_ = g_object_ref_sink (_tmp27_);
-							_tmp29_ = _tmp28_;
-							_g_free0 (_tmp26_);
-							error_dialog = _tmp29_;
+							gint _tmp32_ = 0;
+							gint _tmp33_;
+							GtkMessageDialog* _tmp35_;
+							_tmp23_ = file;
+							_tmp24_ = g_file_get_path (_tmp23_);
+							_tmp25_ = _tmp24_;
+							_tmp26_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE, "Could not delete %s", _tmp25_);
+							g_object_ref_sink (_tmp26_);
+							_tmp27_ = _tmp26_;
+							_g_free0 (_tmp25_);
+							error_dialog = _tmp27_;
+							_tmp28_ = error_dialog;
+							gtk_dialog_add_button ((GtkDialog*) _tmp28_, GTK_STOCK_CANCEL, (gint) GTK_RESPONSE_CANCEL);
+							_tmp29_ = error_dialog;
+							gtk_dialog_add_button ((GtkDialog*) _tmp29_, "Skip", (gint) CHEESE_MAIN_WINDOW_DELETE_RESPONSE_SKIP);
 							_tmp30_ = error_dialog;
-							gtk_dialog_add_button ((GtkDialog*) _tmp30_, GTK_STOCK_CANCEL, (gint) GTK_RESPONSE_CANCEL);
+							gtk_dialog_add_button ((GtkDialog*) _tmp30_, "Skip all", (gint) CHEESE_MAIN_WINDOW_DELETE_RESPONSE_SKIP_ALL);
 							_tmp31_ = error_dialog;
-							gtk_dialog_add_button ((GtkDialog*) _tmp31_, "Skip", (gint) CHEESE_MAIN_WINDOW_DELETE_RESPONSE_SKIP);
-							_tmp32_ = error_dialog;
-							gtk_dialog_add_button ((GtkDialog*) _tmp32_, "Skip all", (gint) CHEESE_MAIN_WINDOW_DELETE_RESPONSE_SKIP_ALL);
-							_tmp33_ = error_dialog;
-							_tmp34_ = gtk_dialog_run ((GtkDialog*) _tmp33_);
-							error_response = _tmp34_;
-							_tmp35_ = error_response;
-							if (_tmp35_ == ((gint) CHEESE_MAIN_WINDOW_DELETE_RESPONSE_SKIP_ALL)) {
+							_tmp32_ = gtk_dialog_run ((GtkDialog*) _tmp31_);
+							error_response = _tmp32_;
+							_tmp33_ = error_response;
+							if (_tmp33_ == ((gint) CHEESE_MAIN_WINDOW_DELETE_RESPONSE_SKIP_ALL)) {
 								skip_all_errors = TRUE;
 							} else {
-								gint _tmp36_;
-								_tmp36_ = error_response;
-								if (_tmp36_ == ((gint) GTK_RESPONSE_CANCEL)) {
+								gint _tmp34_;
+								_tmp34_ = error_response;
+								if (_tmp34_ == ((gint) GTK_RESPONSE_CANCEL)) {
 									_g_object_unref0 (error_dialog);
 									_g_error_free0 (err);
 									_g_object_unref0 (file);
 									break;
 								}
 							}
-							_tmp37_ = error_dialog;
-							gtk_widget_destroy ((GtkWidget*) _tmp37_);
+							_tmp35_ = error_dialog;
+							gtk_widget_destroy ((GtkWidget*) _tmp35_);
 							_g_object_unref0 (error_dialog);
 						}
 						_g_error_free0 (err);
@@ -1011,8 +1008,8 @@
 			}
 		}
 	}
-	_tmp38_ = confirmation_dialog;
-	gtk_widget_destroy ((GtkWidget*) _tmp38_);
+	_tmp36_ = confirmation_dialog;
+	gtk_widget_destroy ((GtkWidget*) _tmp36_);
 	_g_object_unref0 (confirmation_dialog);
 	__g_list_free__g_object_unref0_0 (files);
 }
@@ -1097,10 +1094,9 @@
 					gchar* _tmp18_;
 					GtkMessageDialog* _tmp19_;
 					GtkMessageDialog* _tmp20_;
-					GtkMessageDialog* _tmp21_;
 					GtkMessageDialog* error_dialog;
+					GtkMessageDialog* _tmp21_;
 					GtkMessageDialog* _tmp22_;
-					GtkMessageDialog* _tmp23_;
 					err = _inner_error_;
 					_inner_error_ = NULL;
 					_tmp15_ = _ ("Could not move %s to trash");
@@ -1108,14 +1104,14 @@
 					_tmp17_ = g_file_get_path (_tmp16_);
 					_tmp18_ = _tmp17_;
 					_tmp19_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _tmp15_, _tmp18_);
-					_tmp20_ = g_object_ref_sink (_tmp19_);
-					_tmp21_ = _tmp20_;
+					g_object_ref_sink (_tmp19_);
+					_tmp20_ = _tmp19_;
 					_g_free0 (_tmp18_);
-					error_dialog = _tmp21_;
+					error_dialog = _tmp20_;
+					_tmp21_ = error_dialog;
+					gtk_dialog_run ((GtkDialog*) _tmp21_);
 					_tmp22_ = error_dialog;
-					gtk_dialog_run ((GtkDialog*) _tmp22_);
-					_tmp23_ = error_dialog;
-					gtk_widget_destroy ((GtkWidget*) _tmp23_);
+					gtk_widget_destroy ((GtkWidget*) _tmp22_);
 					_g_object_unref0 (error_dialog);
 					_g_error_free0 (err);
 				}
@@ -1680,18 +1676,17 @@
 	const gchar* _tmp3_ = NULL;
 	GtkFileChooserDialog* _tmp4_;
 	GtkFileChooserDialog* _tmp5_;
-	GtkFileChooserDialog* _tmp6_;
-	const gchar* _tmp7_;
-	gchar* _tmp8_ = NULL;
-	GtkFileChooserDialog* _tmp9_;
-	const gchar* _tmp10_;
-	GtkFileChooserDialog* _tmp11_;
-	const gchar* _tmp12_ = NULL;
-	GtkFileChooserDialog* _tmp13_;
-	gint _tmp14_ = 0;
-	GtkFileChooserDialog* _tmp15_;
-	gint _tmp16_;
-	GtkFileChooserDialog* _tmp31_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_ = NULL;
+	GtkFileChooserDialog* _tmp8_;
+	const gchar* _tmp9_;
+	GtkFileChooserDialog* _tmp10_;
+	const gchar* _tmp11_ = NULL;
+	GtkFileChooserDialog* _tmp12_;
+	gint _tmp13_ = 0;
+	GtkFileChooserDialog* _tmp14_;
+	gint _tmp15_;
+	GtkFileChooserDialog* _tmp29_;
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (action != NULL);
@@ -1708,53 +1703,53 @@
 	}
 	_tmp3_ = _ ("Save File");
 	_tmp4_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp3_, (GtkWindow*) self, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL, NULL);
-	_tmp5_ = g_object_ref_sink (_tmp4_);
+	g_object_ref_sink (_tmp4_);
 	_g_object_unref0 (save_as_dialog);
-	save_as_dialog = _tmp5_;
-	_tmp6_ = save_as_dialog;
-	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp6_, TRUE);
-	_tmp7_ = filename;
-	_tmp8_ = g_filename_display_basename (_tmp7_);
+	save_as_dialog = _tmp4_;
+	_tmp5_ = save_as_dialog;
+	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp5_, TRUE);
+	_tmp6_ = filename;
+	_tmp7_ = g_filename_display_basename (_tmp6_);
 	_g_free0 (basename);
-	basename = _tmp8_;
-	_tmp9_ = save_as_dialog;
-	_tmp10_ = basename;
-	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp9_, _tmp10_);
-	_tmp11_ = save_as_dialog;
-	_tmp12_ = g_get_home_dir ();
-	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp11_, _tmp12_);
-	_tmp13_ = save_as_dialog;
-	_tmp14_ = gtk_dialog_run ((GtkDialog*) _tmp13_);
-	response = _tmp14_;
-	_tmp15_ = save_as_dialog;
-	gtk_widget_hide ((GtkWidget*) _tmp15_);
-	_tmp16_ = response;
-	if (_tmp16_ == ((gint) GTK_RESPONSE_ACCEPT)) {
+	basename = _tmp7_;
+	_tmp8_ = save_as_dialog;
+	_tmp9_ = basename;
+	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp8_, _tmp9_);
+	_tmp10_ = save_as_dialog;
+	_tmp11_ = g_get_home_dir ();
+	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp10_, _tmp11_);
+	_tmp12_ = save_as_dialog;
+	_tmp13_ = gtk_dialog_run ((GtkDialog*) _tmp12_);
+	response = _tmp13_;
+	_tmp14_ = save_as_dialog;
+	gtk_widget_hide ((GtkWidget*) _tmp14_);
+	_tmp15_ = response;
+	if (_tmp15_ == ((gint) GTK_RESPONSE_ACCEPT)) {
 		gchar* target_filename = NULL;
-		GtkFileChooserDialog* _tmp17_;
-		gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_;
-		GFile* _tmp20_ = NULL;
+		GtkFileChooserDialog* _tmp16_;
+		gchar* _tmp17_ = NULL;
+		const gchar* _tmp18_;
+		GFile* _tmp19_ = NULL;
 		GFile* src;
-		const gchar* _tmp21_;
-		GFile* _tmp22_ = NULL;
+		const gchar* _tmp20_;
+		GFile* _tmp21_ = NULL;
 		GFile* dest;
-		_tmp17_ = save_as_dialog;
-		_tmp18_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp17_);
+		_tmp16_ = save_as_dialog;
+		_tmp17_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp16_);
 		_g_free0 (target_filename);
-		target_filename = _tmp18_;
-		_tmp19_ = filename;
-		_tmp20_ = g_file_new_for_path (_tmp19_);
-		src = _tmp20_;
-		_tmp21_ = target_filename;
-		_tmp22_ = g_file_new_for_path (_tmp21_);
-		dest = _tmp22_;
+		target_filename = _tmp17_;
+		_tmp18_ = filename;
+		_tmp19_ = g_file_new_for_path (_tmp18_);
+		src = _tmp19_;
+		_tmp20_ = target_filename;
+		_tmp21_ = g_file_new_for_path (_tmp20_);
+		dest = _tmp21_;
 		{
+			GFile* _tmp22_;
 			GFile* _tmp23_;
-			GFile* _tmp24_;
-			_tmp23_ = src;
-			_tmp24_ = dest;
-			g_file_copy (_tmp23_, _tmp24_, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &_inner_error_);
+			_tmp22_ = src;
+			_tmp23_ = dest;
+			g_file_copy (_tmp22_, _tmp23_, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &_inner_error_);
 			if (_inner_error_ != NULL) {
 				goto __catch8_g_error;
 			}
@@ -1763,24 +1758,23 @@
 		__catch8_g_error:
 		{
 			GError* err = NULL;
-			const gchar* _tmp25_ = NULL;
-			const gchar* _tmp26_;
+			const gchar* _tmp24_ = NULL;
+			const gchar* _tmp25_;
+			GtkMessageDialog* _tmp26_;
+			GtkMessageDialog* error_dialog;
 			GtkMessageDialog* _tmp27_;
 			GtkMessageDialog* _tmp28_;
-			GtkMessageDialog* error_dialog;
-			GtkMessageDialog* _tmp29_;
-			GtkMessageDialog* _tmp30_;
 			err = _inner_error_;
 			_inner_error_ = NULL;
-			_tmp25_ = _ ("Could not save %s");
-			_tmp26_ = target_filename;
-			_tmp27_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _tmp25_, _tmp26_);
-			_tmp28_ = g_object_ref_sink (_tmp27_);
-			error_dialog = _tmp28_;
-			_tmp29_ = error_dialog;
-			gtk_dialog_run ((GtkDialog*) _tmp29_);
-			_tmp30_ = error_dialog;
-			gtk_widget_destroy ((GtkWidget*) _tmp30_);
+			_tmp24_ = _ ("Could not save %s");
+			_tmp25_ = target_filename;
+			_tmp26_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _tmp24_, _tmp25_);
+			g_object_ref_sink (_tmp26_);
+			error_dialog = _tmp26_;
+			_tmp27_ = error_dialog;
+			gtk_dialog_run ((GtkDialog*) _tmp27_);
+			_tmp28_ = error_dialog;
+			gtk_widget_destroy ((GtkWidget*) _tmp28_);
 			_g_object_unref0 (error_dialog);
 			_g_error_free0 (err);
 		}
@@ -1800,8 +1794,8 @@
 		_g_object_unref0 (src);
 		_g_free0 (target_filename);
 	}
-	_tmp31_ = save_as_dialog;
-	gtk_widget_destroy ((GtkWidget*) _tmp31_);
+	_tmp29_ = save_as_dialog;
+	gtk_widget_destroy ((GtkWidget*) _tmp29_);
 	_g_object_unref0 (save_as_dialog);
 	_g_free0 (basename);
 	_g_free0 (filename);
@@ -3076,7 +3070,7 @@
 		ClutterBox* _tmp9_;
 		_tmp8_ = self->priv->viewport_layout;
 		_tmp9_ = self->priv->current_effects_grid;
-		clutter_container_remove ((ClutterContainer*) _tmp8_, CLUTTER_ACTOR (_tmp9_), NULL);
+		clutter_container_remove ((ClutterContainer*) _tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, clutter_actor_get_type (), ClutterActor), NULL);
 	}
 	_tmp10_ = self->priv->effects_grids;
 	_tmp11_ = number;
@@ -3087,7 +3081,7 @@
 	g_object_set ((GObject*) _tmp13_, "opacity", 0, NULL);
 	_tmp14_ = self->priv->viewport_layout;
 	_tmp15_ = self->priv->current_effects_grid;
-	clutter_container_add ((ClutterContainer*) _tmp14_, CLUTTER_ACTOR (_tmp15_), NULL);
+	clutter_container_add ((ClutterContainer*) _tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, clutter_actor_get_type (), ClutterActor), NULL);
 	_tmp16_ = self->priv->current_effects_grid;
 	clutter_actor_animate ((ClutterActor*) _tmp16_, (gulong) CLUTTER_LINEAR, (guint) 1000, "opacity", 255, NULL);
 	{
@@ -3317,8 +3311,8 @@
 		GeeArrayList* _tmp5_;
 		gint _tmp6_;
 		gint _tmp7_;
-		GeeArrayList* _tmp90_;
-		gpointer _tmp91_ = NULL;
+		GeeArrayList* _tmp83_;
+		gpointer _tmp84_ = NULL;
 		_tmp1_ = cheese_effects_manager_new ();
 		_g_object_unref0 (self->priv->effects_manager);
 		self->priv->effects_manager = _tmp1_;
@@ -3349,16 +3343,14 @@
 					gint _tmp14_;
 					gint _tmp15_;
 					ClutterTableLayout* _tmp16_;
-					ClutterTableLayout* _tmp17_;
 					ClutterTableLayout* table_layout;
-					ClutterTableLayout* _tmp18_;
-					ClutterBox* _tmp19_;
-					ClutterBox* _tmp20_;
+					ClutterTableLayout* _tmp17_;
+					ClutterBox* _tmp18_;
 					ClutterBox* grid;
-					GeeArrayList* _tmp21_;
-					ClutterBox* _tmp22_;
-					ClutterTableLayout* _tmp23_;
-					ClutterTableLayout* _tmp24_;
+					GeeArrayList* _tmp19_;
+					ClutterBox* _tmp20_;
+					ClutterTableLayout* _tmp21_;
+					ClutterTableLayout* _tmp22_;
 					_tmp9_ = _tmp8_;
 					if (!_tmp9_) {
 						gint _tmp10_;
@@ -3375,19 +3367,19 @@
 						break;
 					}
 					_tmp16_ = (ClutterTableLayout*) clutter_table_layout_new ();
-					_tmp17_ = g_object_ref_sink (_tmp16_);
-					table_layout = _tmp17_;
-					_tmp18_ = table_layout;
-					_tmp19_ = (ClutterBox*) clutter_box_new ((ClutterLayoutManager*) _tmp18_);
-					_tmp20_ = g_object_ref_sink (_tmp19_);
-					grid = _tmp20_;
-					_tmp21_ = self->priv->effects_grids;
-					_tmp22_ = grid;
-					gee_abstract_collection_add ((GeeAbstractCollection*) _tmp21_, _tmp22_);
-					_tmp23_ = table_layout;
-					clutter_table_layout_set_column_spacing (_tmp23_, (guint) 10);
-					_tmp24_ = table_layout;
-					clutter_table_layout_set_row_spacing (_tmp24_, (guint) 10);
+					g_object_ref_sink (_tmp16_);
+					table_layout = _tmp16_;
+					_tmp17_ = table_layout;
+					_tmp18_ = (ClutterBox*) clutter_box_new ((ClutterLayoutManager*) _tmp17_);
+					g_object_ref_sink (_tmp18_);
+					grid = _tmp18_;
+					_tmp19_ = self->priv->effects_grids;
+					_tmp20_ = grid;
+					gee_abstract_collection_add ((GeeAbstractCollection*) _tmp19_, _tmp20_);
+					_tmp21_ = table_layout;
+					clutter_table_layout_set_column_spacing (_tmp21_, (guint) 10);
+					_tmp22_ = table_layout;
+					clutter_table_layout_set_row_spacing (_tmp22_, (guint) 10);
 					_g_object_unref0 (grid);
 					_g_object_unref0 (table_layout);
 				}
@@ -3397,174 +3389,169 @@
 			gint i;
 			i = 0;
 			{
-				gboolean _tmp25_;
-				_tmp25_ = TRUE;
+				gboolean _tmp23_;
+				_tmp23_ = TRUE;
 				while (TRUE) {
-					gboolean _tmp26_;
-					gint _tmp28_;
-					CheeseEffectsManager* _tmp29_;
-					GeeArrayList* _tmp30_;
-					gint _tmp31_;
-					gint _tmp32_;
-					CheeseEffectsManager* _tmp33_;
-					GeeArrayList* _tmp34_;
-					gint _tmp35_;
-					gpointer _tmp36_ = NULL;
+					gboolean _tmp24_;
+					gint _tmp26_;
+					CheeseEffectsManager* _tmp27_;
+					GeeArrayList* _tmp28_;
+					gint _tmp29_;
+					gint _tmp30_;
+					CheeseEffectsManager* _tmp31_;
+					GeeArrayList* _tmp32_;
+					gint _tmp33_;
+					gpointer _tmp34_ = NULL;
 					CheeseEffect* effect;
-					ClutterTexture* _tmp37_;
-					ClutterTexture* _tmp38_;
+					ClutterTexture* _tmp35_;
 					ClutterTexture* texture;
-					ClutterBinLayout* _tmp39_;
-					ClutterBinLayout* _tmp40_;
+					ClutterBinLayout* _tmp36_;
 					ClutterBinLayout* layout;
-					ClutterBinLayout* _tmp41_;
-					ClutterBox* _tmp42_;
-					ClutterBox* _tmp43_;
+					ClutterBinLayout* _tmp37_;
+					ClutterBox* _tmp38_;
 					ClutterBox* box;
-					ClutterText* _tmp44_;
-					ClutterText* _tmp45_;
+					ClutterText* _tmp39_;
 					ClutterText* text;
-					ClutterRectangle* _tmp46_;
-					ClutterRectangle* _tmp47_;
+					ClutterRectangle* _tmp40_;
 					ClutterRectangle* rect;
-					ClutterRectangle* _tmp48_;
-					ClutterRectangle* _tmp49_;
-					ClutterColor _tmp50_ = {0};
-					ClutterTexture* _tmp51_;
-					ClutterBox* _tmp52_;
+					ClutterRectangle* _tmp41_;
+					ClutterRectangle* _tmp42_;
+					ClutterColor _tmp43_ = {0};
+					ClutterTexture* _tmp44_;
+					ClutterBox* _tmp45_;
+					ClutterTexture* _tmp46_;
+					ClutterBox* _tmp47_;
+					ClutterBox* _tmp48_;
+					CheeseEffect* _tmp49_;
+					CheeseEffect* _tmp50_;
+					CheeseEffect* _tmp51_;
+					ClutterTexture* _tmp52_;
 					ClutterTexture* _tmp53_;
 					ClutterBox* _tmp54_;
-					ClutterBox* _tmp55_;
+					ClutterText* _tmp55_;
 					CheeseEffect* _tmp56_;
-					CheeseEffect* _tmp57_;
-					CheeseEffect* _tmp58_;
-					ClutterTexture* _tmp59_;
-					ClutterTexture* _tmp60_;
-					ClutterBox* _tmp61_;
+					const gchar* _tmp57_;
+					const gchar* _tmp58_;
+					ClutterText* _tmp59_;
+					ClutterColor _tmp60_ = {0};
+					ClutterRectangle* _tmp61_;
 					ClutterText* _tmp62_;
-					CheeseEffect* _tmp63_;
-					const gchar* _tmp64_;
-					const gchar* _tmp65_;
-					ClutterText* _tmp66_;
-					ClutterColor _tmp67_ = {0};
-					ClutterRectangle* _tmp68_;
-					ClutterText* _tmp69_;
-					gfloat _tmp70_;
-					gfloat _tmp71_;
+					gfloat _tmp63_;
+					gfloat _tmp64_;
+					ClutterBox* _tmp65_;
+					ClutterRectangle* _tmp66_;
+					ClutterBox* _tmp67_;
+					ClutterText* _tmp68_;
+					GeeArrayList* _tmp69_;
+					gint _tmp70_;
+					gpointer _tmp71_ = NULL;
 					ClutterBox* _tmp72_;
-					ClutterRectangle* _tmp73_;
-					ClutterBox* _tmp74_;
-					ClutterText* _tmp75_;
-					GeeArrayList* _tmp76_;
-					gint _tmp77_;
-					gpointer _tmp78_ = NULL;
-					ClutterBox* _tmp79_;
-					ClutterLayoutManager* _tmp80_;
-					ClutterLayoutManager* _tmp81_;
-					ClutterTableLayout* _tmp82_;
-					ClutterTableLayout* _tmp83_;
+					ClutterLayoutManager* _tmp73_;
+					ClutterLayoutManager* _tmp74_;
+					ClutterTableLayout* _tmp75_;
+					ClutterTableLayout* _tmp76_;
 					ClutterTableLayout* table_layout;
-					ClutterTableLayout* _tmp84_;
-					ClutterBox* _tmp85_;
-					gint _tmp86_;
-					gint _tmp87_;
-					ClutterTableLayout* _tmp88_;
-					ClutterBox* _tmp89_;
-					_tmp26_ = _tmp25_;
-					if (!_tmp26_) {
-						gint _tmp27_;
-						_tmp27_ = i;
-						i = _tmp27_ + 1;
+					ClutterTableLayout* _tmp77_;
+					ClutterBox* _tmp78_;
+					gint _tmp79_;
+					gint _tmp80_;
+					ClutterTableLayout* _tmp81_;
+					ClutterBox* _tmp82_;
+					_tmp24_ = _tmp23_;
+					if (!_tmp24_) {
+						gint _tmp25_;
+						_tmp25_ = i;
+						i = _tmp25_ + 1;
 					}
-					_tmp25_ = FALSE;
-					_tmp28_ = i;
-					_tmp29_ = self->priv->effects_manager;
-					_tmp30_ = _tmp29_->effects;
-					_tmp31_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp30_);
-					_tmp32_ = _tmp31_;
-					if (!(_tmp28_ < _tmp32_)) {
+					_tmp23_ = FALSE;
+					_tmp26_ = i;
+					_tmp27_ = self->priv->effects_manager;
+					_tmp28_ = _tmp27_->effects;
+					_tmp29_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp28_);
+					_tmp30_ = _tmp29_;
+					if (!(_tmp26_ < _tmp30_)) {
 						break;
 					}
-					_tmp33_ = self->priv->effects_manager;
-					_tmp34_ = _tmp33_->effects;
-					_tmp35_ = i;
-					_tmp36_ = gee_abstract_list_get ((GeeAbstractList*) _tmp34_, _tmp35_);
-					effect = (CheeseEffect*) _tmp36_;
-					_tmp37_ = (ClutterTexture*) clutter_texture_new ();
-					_tmp38_ = g_object_ref_sink (_tmp37_);
-					texture = _tmp38_;
-					_tmp39_ = (ClutterBinLayout*) clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER, CLUTTER_BIN_ALIGNMENT_CENTER);
-					_tmp40_ = g_object_ref_sink (_tmp39_);
-					layout = _tmp40_;
-					_tmp41_ = layout;
-					_tmp42_ = (ClutterBox*) clutter_box_new ((ClutterLayoutManager*) _tmp41_);
-					_tmp43_ = g_object_ref_sink (_tmp42_);
-					box = _tmp43_;
-					_tmp44_ = (ClutterText*) clutter_text_new ();
-					_tmp45_ = g_object_ref_sink (_tmp44_);
-					text = _tmp45_;
-					_tmp46_ = (ClutterRectangle*) clutter_rectangle_new ();
-					_tmp47_ = g_object_ref_sink (_tmp46_);
-					rect = _tmp47_;
-					_tmp48_ = rect;
-					clutter_actor_set_opacity ((ClutterActor*) _tmp48_, (guint) 128);
-					_tmp49_ = rect;
-					clutter_color_from_string (&_tmp50_, "black");
-					clutter_rectangle_set_color (_tmp49_, &_tmp50_);
-					_tmp51_ = texture;
-					clutter_texture_set_keep_aspect_ratio (_tmp51_, TRUE);
-					_tmp52_ = box;
-					_tmp53_ = texture;
-					clutter_box_pack (_tmp52_, CLUTTER_ACTOR (_tmp53_), NULL, NULL, NULL);
+					_tmp31_ = self->priv->effects_manager;
+					_tmp32_ = _tmp31_->effects;
+					_tmp33_ = i;
+					_tmp34_ = gee_abstract_list_get ((GeeAbstractList*) _tmp32_, _tmp33_);
+					effect = (CheeseEffect*) _tmp34_;
+					_tmp35_ = (ClutterTexture*) clutter_texture_new ();
+					g_object_ref_sink (_tmp35_);
+					texture = _tmp35_;
+					_tmp36_ = (ClutterBinLayout*) clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER, CLUTTER_BIN_ALIGNMENT_CENTER);
+					g_object_ref_sink (_tmp36_);
+					layout = _tmp36_;
+					_tmp37_ = layout;
+					_tmp38_ = (ClutterBox*) clutter_box_new ((ClutterLayoutManager*) _tmp37_);
+					g_object_ref_sink (_tmp38_);
+					box = _tmp38_;
+					_tmp39_ = (ClutterText*) clutter_text_new ();
+					g_object_ref_sink (_tmp39_);
+					text = _tmp39_;
+					_tmp40_ = (ClutterRectangle*) clutter_rectangle_new ();
+					g_object_ref_sink (_tmp40_);
+					rect = _tmp40_;
+					_tmp41_ = rect;
+					clutter_actor_set_opacity ((ClutterActor*) _tmp41_, (guint) 128);
+					_tmp42_ = rect;
+					clutter_color_from_string (&_tmp43_, "black");
+					clutter_rectangle_set_color (_tmp42_, &_tmp43_);
+					_tmp44_ = texture;
+					clutter_texture_set_keep_aspect_ratio (_tmp44_, TRUE);
+					_tmp45_ = box;
+					_tmp46_ = texture;
+					clutter_box_pack (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, clutter_actor_get_type (), ClutterActor), NULL, NULL, NULL);
+					_tmp47_ = box;
+					clutter_actor_set_reactive ((ClutterActor*) _tmp47_, TRUE);
+					_tmp48_ = box;
+					_tmp49_ = effect;
+					_tmp50_ = _g_object_ref0 (_tmp49_);
+					g_object_set_data_full ((GObject*) _tmp48_, "effect", _tmp50_, g_object_unref);
+					_tmp51_ = effect;
+					_tmp52_ = texture;
+					_tmp53_ = _g_object_ref0 (_tmp52_);
+					g_object_set_data_full ((GObject*) _tmp51_, "texture", _tmp53_, g_object_unref);
 					_tmp54_ = box;
-					clutter_actor_set_reactive ((ClutterActor*) _tmp54_, TRUE);
-					_tmp55_ = box;
+					g_signal_connect_object ((ClutterActor*) _tmp54_, "button-release-event", (GCallback) _cheese_main_window_on_selected_effect_change_clutter_actor_button_release_event, self, 0);
+					_tmp55_ = text;
 					_tmp56_ = effect;
-					_tmp57_ = _g_object_ref0 (_tmp56_);
-					g_object_set_data_full ((GObject*) _tmp55_, "effect", _tmp57_, g_object_unref);
-					_tmp58_ = effect;
-					_tmp59_ = texture;
-					_tmp60_ = _g_object_ref0 (_tmp59_);
-					g_object_set_data_full ((GObject*) _tmp58_, "texture", _tmp60_, g_object_unref);
-					_tmp61_ = box;
-					g_signal_connect_object ((ClutterActor*) _tmp61_, "button-release-event", (GCallback) _cheese_main_window_on_selected_effect_change_clutter_actor_button_release_event, self, 0);
+					_tmp57_ = cheese_effect_get_name (_tmp56_);
+					_tmp58_ = _tmp57_;
+					clutter_text_set_text (_tmp55_, _tmp58_);
+					_tmp59_ = text;
+					clutter_color_from_string (&_tmp60_, "white");
+					clutter_text_set_color (_tmp59_, &_tmp60_);
+					_tmp61_ = rect;
 					_tmp62_ = text;
-					_tmp63_ = effect;
-					_tmp64_ = cheese_effect_get_name (_tmp63_);
-					_tmp65_ = _tmp64_;
-					clutter_text_set_text (_tmp62_, _tmp65_);
-					_tmp66_ = text;
-					clutter_color_from_string (&_tmp67_, "white");
-					clutter_text_set_color (_tmp66_, &_tmp67_);
-					_tmp68_ = rect;
-					_tmp69_ = text;
-					_tmp70_ = clutter_actor_get_height ((ClutterActor*) _tmp69_);
-					_tmp71_ = _tmp70_;
-					clutter_actor_set_height ((ClutterActor*) _tmp68_, _tmp71_ + 5);
-					_tmp72_ = box;
-					_tmp73_ = rect;
-					clutter_box_pack (_tmp72_, CLUTTER_ACTOR (_tmp73_), "x-align", CLUTTER_BIN_ALIGNMENT_FILL, "y-align", CLUTTER_BIN_ALIGNMENT_END, NULL, NULL);
-					_tmp74_ = box;
-					_tmp75_ = text;
-					clutter_box_pack (_tmp74_, CLUTTER_ACTOR (_tmp75_), "x-align", CLUTTER_BIN_ALIGNMENT_CENTER, "y-align", CLUTTER_BIN_ALIGNMENT_END, NULL, NULL);
-					_tmp76_ = self->priv->effects_grids;
-					_tmp77_ = i;
-					_tmp78_ = gee_abstract_list_get ((GeeAbstractList*) _tmp76_, _tmp77_ / EFFECTS_PER_PAGE);
-					_tmp79_ = (ClutterBox*) _tmp78_;
-					_tmp80_ = clutter_box_get_layout_manager (_tmp79_);
-					_tmp81_ = _tmp80_;
-					_tmp82_ = _g_object_ref0 (CLUTTER_TABLE_LAYOUT (_tmp81_));
-					_tmp83_ = _tmp82_;
-					_g_object_unref0 (_tmp79_);
-					table_layout = _tmp83_;
-					_tmp84_ = table_layout;
-					_tmp85_ = box;
-					_tmp86_ = i;
-					_tmp87_ = i;
-					clutter_table_layout_pack (_tmp84_, CLUTTER_ACTOR (_tmp85_), (_tmp86_ % EFFECTS_PER_PAGE) % 3, (_tmp87_ % EFFECTS_PER_PAGE) / 3);
-					_tmp88_ = table_layout;
-					_tmp89_ = box;
-					clutter_table_layout_set_expand (_tmp88_, (ClutterActor*) _tmp89_, FALSE, FALSE);
+					_tmp63_ = clutter_actor_get_height ((ClutterActor*) _tmp62_);
+					_tmp64_ = _tmp63_;
+					clutter_actor_set_height ((ClutterActor*) _tmp61_, _tmp64_ + 5);
+					_tmp65_ = box;
+					_tmp66_ = rect;
+					clutter_box_pack (_tmp65_, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, clutter_actor_get_type (), ClutterActor), "x-align", CLUTTER_BIN_ALIGNMENT_FILL, "y-align", CLUTTER_BIN_ALIGNMENT_END, NULL, NULL);
+					_tmp67_ = box;
+					_tmp68_ = text;
+					clutter_box_pack (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, clutter_actor_get_type (), ClutterActor), "x-align", CLUTTER_BIN_ALIGNMENT_CENTER, "y-align", CLUTTER_BIN_ALIGNMENT_END, NULL, NULL);
+					_tmp69_ = self->priv->effects_grids;
+					_tmp70_ = i;
+					_tmp71_ = gee_abstract_list_get ((GeeAbstractList*) _tmp69_, _tmp70_ / EFFECTS_PER_PAGE);
+					_tmp72_ = (ClutterBox*) _tmp71_;
+					_tmp73_ = clutter_box_get_layout_manager (_tmp72_);
+					_tmp74_ = _tmp73_;
+					_tmp75_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, clutter_table_layout_get_type (), ClutterTableLayout));
+					_tmp76_ = _tmp75_;
+					_g_object_unref0 (_tmp72_);
+					table_layout = _tmp76_;
+					_tmp77_ = table_layout;
+					_tmp78_ = box;
+					_tmp79_ = i;
+					_tmp80_ = i;
+					clutter_table_layout_pack (_tmp77_, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, clutter_actor_get_type (), ClutterActor), (_tmp79_ % EFFECTS_PER_PAGE) % 3, (_tmp80_ % EFFECTS_PER_PAGE) / 3);
+					_tmp81_ = table_layout;
+					_tmp82_ = box;
+					clutter_table_layout_set_expand (_tmp81_, (ClutterActor*) _tmp82_, FALSE, FALSE);
 					_g_object_unref0 (table_layout);
 					_g_object_unref0 (rect);
 					_g_object_unref0 (text);
@@ -3576,10 +3563,10 @@
 			}
 		}
 		cheese_main_window_setup_effects_page_switch_sensitivity (self);
-		_tmp90_ = self->priv->effects_grids;
-		_tmp91_ = gee_abstract_list_get ((GeeAbstractList*) _tmp90_, 0);
+		_tmp83_ = self->priv->effects_grids;
+		_tmp84_ = gee_abstract_list_get ((GeeAbstractList*) _tmp83_, 0);
 		_g_object_unref0 (self->priv->current_effects_grid);
-		self->priv->current_effects_grid = (ClutterBox*) _tmp91_;
+		self->priv->current_effects_grid = (ClutterBox*) _tmp84_;
 	}
 }
 
@@ -3639,13 +3626,13 @@
 				_tmp12_ = self->priv->gtk_builder;
 				_tmp13_ = key;
 				_tmp14_ = gtk_builder_get_object (_tmp12_, _tmp13_);
-				_tmp15_ = _g_object_ref0 (GTK_IS_ACTION (_tmp14_) ? ((GtkAction*) _tmp14_) : NULL);
+				_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, GTK_TYPE_ACTION) ? ((GtkAction*) _tmp14_) : NULL);
 				action = _tmp15_;
 				_tmp16_ = action;
 				_tmp17_ = self->priv->action_sensitivities;
 				_tmp18_ = key;
 				_tmp19_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp17_, _tmp18_);
-				gtk_action_set_sensitive (_tmp16_, GPOINTER_TO_INT (_tmp19_));
+				gtk_action_set_sensitive (_tmp16_, (gboolean) ((gintptr) _tmp19_));
 				_g_object_unref0 (action);
 				_g_free0 (key);
 			}
@@ -3692,7 +3679,7 @@
 				{
 					GObject* _tmp26_;
 					_tmp26_ = obj;
-					if (GTK_IS_ACTION (_tmp26_)) {
+					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, GTK_TYPE_ACTION)) {
 						GObject* _tmp27_;
 						GtkAction* _tmp28_;
 						GtkAction* action;
@@ -3704,7 +3691,7 @@
 						gboolean _tmp34_;
 						gboolean _tmp35_;
 						_tmp27_ = obj;
-						_tmp28_ = _g_object_ref0 (GTK_ACTION (_tmp27_));
+						_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_ACTION, GtkAction));
 						action = _tmp28_;
 						_tmp29_ = self->priv->action_sensitivities;
 						_tmp30_ = action;
@@ -3713,7 +3700,7 @@
 						_tmp33_ = action;
 						_tmp34_ = gtk_action_get_sensitive (_tmp33_);
 						_tmp35_ = _tmp34_;
-						gee_abstract_map_set ((GeeAbstractMap*) _tmp29_, _tmp32_, GINT_TO_POINTER (_tmp35_));
+						gee_abstract_map_set ((GeeAbstractMap*) _tmp29_, _tmp32_, (gpointer) ((gintptr) _tmp35_));
 						_g_object_unref0 (action);
 					}
 					_g_object_unref0 (obj);
@@ -3754,7 +3741,7 @@
 					GObject* _tmp47_;
 					flag = FALSE;
 					_tmp47_ = obj;
-					if (GTK_IS_ACTION (_tmp47_)) {
+					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, GTK_TYPE_ACTION)) {
 						GObject* _tmp48_;
 						GtkAction* _tmp49_;
 						GtkAction* action;
@@ -3762,7 +3749,7 @@
 						gint _tmp50__length1;
 						gboolean _tmp56_;
 						_tmp48_ = obj;
-						_tmp49_ = _g_object_ref0 (GTK_ACTION (_tmp48_));
+						_tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_ACTION, GtkAction));
 						action = _tmp49_;
 						_tmp50_ = active_actions;
 						_tmp50__length1 = active_actions_length1;
@@ -3798,7 +3785,7 @@
 						if (!_tmp56_) {
 							GObject* _tmp57_;
 							_tmp57_ = obj;
-							gtk_action_set_sensitive (GTK_ACTION (_tmp57_), FALSE);
+							gtk_action_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GTK_TYPE_ACTION, GtkAction), FALSE);
 						}
 						_g_object_unref0 (action);
 					}
@@ -3908,143 +3895,140 @@
 	ClutterScript* _tmp1_;
 	CheeseFileUtil* _tmp2_;
 	CheeseFlash* _tmp3_;
-	CheeseFlash* _tmp4_;
-	GSettings* _tmp5_;
-	GtkBuilder* _tmp17_;
-	GObject* _tmp18_ = NULL;
-	GtkGrid* _tmp19_;
-	GtkBuilder* _tmp20_;
-	GObject* _tmp21_ = NULL;
-	GtkWidget* _tmp22_;
-	GtkBuilder* _tmp23_;
-	GObject* _tmp24_ = NULL;
+	GSettings* _tmp4_;
+	GtkBuilder* _tmp16_;
+	GObject* _tmp17_ = NULL;
+	GtkGrid* _tmp18_;
+	GtkBuilder* _tmp19_;
+	GObject* _tmp20_ = NULL;
+	GtkWidget* _tmp21_;
+	GtkBuilder* _tmp22_;
+	GObject* _tmp23_ = NULL;
+	GtkClutterEmbed* _tmp24_;
 	GtkClutterEmbed* _tmp25_;
-	GtkClutterEmbed* _tmp26_;
-	ClutterActor* _tmp27_ = NULL;
-	ClutterStage* _tmp28_;
-	GtkBuilder* _tmp29_;
-	GObject* _tmp30_ = NULL;
-	GtkAlignment* _tmp31_;
-	GtkBuilder* _tmp32_;
-	GObject* _tmp33_ = NULL;
-	GtkAlignment* _tmp34_;
-	GtkBuilder* _tmp35_;
-	GObject* _tmp36_ = NULL;
-	GtkBox* _tmp37_;
-	GtkBuilder* _tmp38_;
-	GObject* _tmp39_ = NULL;
-	GtkToggleButton* _tmp40_;
-	GtkBuilder* _tmp41_;
-	GObject* _tmp42_ = NULL;
-	GtkToggleButton* _tmp43_;
-	GtkBuilder* _tmp44_;
-	GObject* _tmp45_ = NULL;
-	GtkToggleButton* _tmp46_;
-	GtkBuilder* _tmp47_;
-	GObject* _tmp48_ = NULL;
-	GtkButton* _tmp49_;
-	GtkBuilder* _tmp50_;
-	GObject* _tmp51_ = NULL;
-	GtkLabel* _tmp52_;
-	GtkBuilder* _tmp53_;
-	GObject* _tmp54_ = NULL;
-	GtkImage* _tmp55_;
-	GtkBuilder* _tmp56_;
-	GObject* _tmp57_ = NULL;
-	GtkToggleButton* _tmp58_;
-	GtkBuilder* _tmp59_;
-	GObject* _tmp60_ = NULL;
-	GtkButton* _tmp61_;
-	GtkBuilder* _tmp62_;
-	GObject* _tmp63_ = NULL;
-	GtkBox* _tmp64_;
-	GtkBuilder* _tmp65_;
-	GObject* _tmp66_ = NULL;
-	GtkMenu* _tmp67_;
-	GtkBuilder* _tmp68_;
-	GObject* _tmp69_ = NULL;
-	GtkAction* _tmp70_;
-	GtkBuilder* _tmp71_;
-	GObject* _tmp72_ = NULL;
-	GtkToggleAction* _tmp73_;
-	GtkBuilder* _tmp74_;
-	GObject* _tmp75_ = NULL;
-	GtkAction* _tmp76_;
-	GtkBuilder* _tmp77_;
-	GObject* _tmp78_ = NULL;
-	GtkAction* _tmp79_;
-	GtkBuilder* _tmp80_;
-	GObject* _tmp81_ = NULL;
-	GtkAction* _tmp82_;
-	CheeseShareableMedia* _tmp83_;
-	GtkToggleButton* _tmp84_;
-	GtkButton* _tmp85_;
-	GtkToggleButton* _tmp86_;
-	GtkButton* _tmp87_;
-	GtkToggleButton* _tmp88_;
+	ClutterActor* _tmp26_ = NULL;
+	ClutterStage* _tmp27_;
+	GtkBuilder* _tmp28_;
+	GObject* _tmp29_ = NULL;
+	GtkAlignment* _tmp30_;
+	GtkBuilder* _tmp31_;
+	GObject* _tmp32_ = NULL;
+	GtkAlignment* _tmp33_;
+	GtkBuilder* _tmp34_;
+	GObject* _tmp35_ = NULL;
+	GtkBox* _tmp36_;
+	GtkBuilder* _tmp37_;
+	GObject* _tmp38_ = NULL;
+	GtkToggleButton* _tmp39_;
+	GtkBuilder* _tmp40_;
+	GObject* _tmp41_ = NULL;
+	GtkToggleButton* _tmp42_;
+	GtkBuilder* _tmp43_;
+	GObject* _tmp44_ = NULL;
+	GtkToggleButton* _tmp45_;
+	GtkBuilder* _tmp46_;
+	GObject* _tmp47_ = NULL;
+	GtkButton* _tmp48_;
+	GtkBuilder* _tmp49_;
+	GObject* _tmp50_ = NULL;
+	GtkLabel* _tmp51_;
+	GtkBuilder* _tmp52_;
+	GObject* _tmp53_ = NULL;
+	GtkImage* _tmp54_;
+	GtkBuilder* _tmp55_;
+	GObject* _tmp56_ = NULL;
+	GtkToggleButton* _tmp57_;
+	GtkBuilder* _tmp58_;
+	GObject* _tmp59_ = NULL;
+	GtkButton* _tmp60_;
+	GtkBuilder* _tmp61_;
+	GObject* _tmp62_ = NULL;
+	GtkBox* _tmp63_;
+	GtkBuilder* _tmp64_;
+	GObject* _tmp65_ = NULL;
+	GtkMenu* _tmp66_;
+	GtkBuilder* _tmp67_;
+	GObject* _tmp68_ = NULL;
+	GtkAction* _tmp69_;
+	GtkBuilder* _tmp70_;
+	GObject* _tmp71_ = NULL;
+	GtkToggleAction* _tmp72_;
+	GtkBuilder* _tmp73_;
+	GObject* _tmp74_ = NULL;
+	GtkAction* _tmp75_;
+	GtkBuilder* _tmp76_;
+	GObject* _tmp77_ = NULL;
+	GtkAction* _tmp78_;
+	GtkBuilder* _tmp79_;
+	GObject* _tmp80_ = NULL;
+	GtkAction* _tmp81_;
+	CheeseShareableMedia* _tmp82_;
+	GtkToggleButton* _tmp83_;
+	GtkButton* _tmp84_;
+	GtkToggleButton* _tmp85_;
+	GtkButton* _tmp86_;
+	GtkToggleButton* _tmp87_;
+	GtkButton* _tmp88_;
 	GtkButton* _tmp89_;
 	GtkButton* _tmp90_;
-	GtkButton* _tmp91_;
-	GtkToggleButton* _tmp92_;
+	GtkToggleButton* _tmp91_;
+	GtkButton* _tmp92_;
 	GtkButton* _tmp93_;
 	GtkButton* _tmp94_;
-	GtkButton* _tmp95_;
-	GtkButton** _tmp96_ = NULL;
-	ClutterScript* _tmp97_;
-	GObject* _tmp98_ = NULL;
-	ClutterTexture* _tmp99_;
-	ClutterScript* _tmp100_;
-	GObject* _tmp101_ = NULL;
-	ClutterBox* _tmp102_;
-	ClutterScript* _tmp103_;
-	GObject* _tmp104_ = NULL;
-	ClutterBinLayout* _tmp105_;
-	ClutterScript* _tmp106_;
-	GObject* _tmp107_ = NULL;
-	ClutterText* _tmp108_;
-	ClutterScript* _tmp109_;
-	GObject* _tmp110_ = NULL;
-	ClutterRectangle* _tmp111_;
-	ClutterScript* _tmp112_;
-	GObject* _tmp113_ = NULL;
-	ClutterText* _tmp114_;
-	ClutterScript* _tmp115_;
-	GObject* _tmp116_ = NULL;
-	ClutterText* _tmp117_;
+	GtkButton** _tmp95_ = NULL;
+	ClutterScript* _tmp96_;
+	GObject* _tmp97_ = NULL;
+	ClutterTexture* _tmp98_;
+	ClutterScript* _tmp99_;
+	GObject* _tmp100_ = NULL;
+	ClutterBox* _tmp101_;
+	ClutterScript* _tmp102_;
+	GObject* _tmp103_ = NULL;
+	ClutterBinLayout* _tmp104_;
+	ClutterScript* _tmp105_;
+	GObject* _tmp106_ = NULL;
+	ClutterText* _tmp107_;
+	ClutterScript* _tmp108_;
+	GObject* _tmp109_ = NULL;
+	ClutterRectangle* _tmp110_;
+	ClutterScript* _tmp111_;
+	GObject* _tmp112_ = NULL;
+	ClutterText* _tmp113_;
+	ClutterScript* _tmp114_;
+	GObject* _tmp115_ = NULL;
+	ClutterText* _tmp116_;
+	ClutterTexture* _tmp117_;
 	ClutterTexture* _tmp118_;
-	ClutterTexture* _tmp119_;
-	ClutterStage* _tmp120_;
-	ClutterRectangle* _tmp121_;
-	ClutterBox* _tmp122_;
-	ClutterBinLayout* _tmp123_;
-	ClutterStage* _tmp124_;
-	ClutterBox* _tmp125_;
-	ClutterStage* _tmp126_;
-	ClutterText* _tmp127_;
-	ClutterStage* _tmp128_;
+	ClutterStage* _tmp119_;
+	ClutterRectangle* _tmp120_;
+	ClutterBox* _tmp121_;
+	ClutterBinLayout* _tmp122_;
+	ClutterStage* _tmp123_;
+	ClutterBox* _tmp124_;
+	ClutterStage* _tmp125_;
+	ClutterText* _tmp126_;
+	ClutterStage* _tmp127_;
+	CheeseThumbView* _tmp128_;
 	CheeseThumbView* _tmp129_;
-	CheeseThumbView* _tmp130_;
-	CheeseThumbView* _tmp131_;
-	EogThumbNav* _tmp132_;
-	EogThumbNav* _tmp133_;
+	EogThumbNav* _tmp130_;
 	GtkCssProvider* css = NULL;
 	GtkStyleContext* context = NULL;
-	CheeseThumbView* _tmp140_;
-	GtkStyleContext* _tmp141_ = NULL;
-	GtkStyleContext* _tmp142_;
-	GdkScreen* _tmp143_ = NULL;
-	GtkStyleContext* _tmp144_;
-	GdkScreen* _tmp145_;
-	GdkScreen* _tmp146_;
-	CheeseThumbView* _tmp147_;
-	GtkGrid* _tmp148_;
-	GtkGrid* _tmp149_;
-	GtkClutterEmbed* _tmp150_;
-	GtkToggleAction* _tmp151_;
-	GSettings* _tmp152_;
-	gboolean _tmp153_ = FALSE;
-	GSettings* _tmp154_;
-	gboolean _tmp155_ = FALSE;
+	CheeseThumbView* _tmp137_;
+	GtkStyleContext* _tmp138_ = NULL;
+	GtkStyleContext* _tmp139_;
+	GdkScreen* _tmp140_ = NULL;
+	GtkStyleContext* _tmp141_;
+	GdkScreen* _tmp142_;
+	GdkScreen* _tmp143_;
+	CheeseThumbView* _tmp144_;
+	GtkGrid* _tmp145_;
+	GtkGrid* _tmp146_;
+	GtkClutterEmbed* _tmp147_;
+	GtkToggleAction* _tmp148_;
+	GSettings* _tmp149_;
+	gboolean _tmp150_ = FALSE;
+	GSettings* _tmp151_;
+	gboolean _tmp152_ = FALSE;
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = gtk_builder_new ();
@@ -4057,46 +4041,46 @@
 	_g_object_unref0 (self->priv->fileutil);
 	self->priv->fileutil = _tmp2_;
 	_tmp3_ = cheese_flash_new ((GtkWidget*) self);
-	_tmp4_ = g_object_ref_sink (_tmp3_);
+	g_object_ref_sink (_tmp3_);
 	_g_object_unref0 (self->priv->flash);
-	self->priv->flash = _tmp4_;
-	_tmp5_ = g_settings_new ("org.gnome.Cheese");
+	self->priv->flash = _tmp3_;
+	_tmp4_ = g_settings_new ("org.gnome.Cheese");
 	_g_object_unref0 (self->priv->settings);
-	self->priv->settings = _tmp5_;
+	self->priv->settings = _tmp4_;
 	{
-		GtkBuilder* _tmp6_;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_;
-		GtkBuilder* _tmp9_;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_;
-		GtkBuilder* _tmp12_;
-		ClutterScript* _tmp13_;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_;
-		_tmp6_ = self->priv->gtk_builder;
-		_tmp7_ = g_build_filename (PACKAGE_DATADIR, "cheese-actions.ui", NULL);
-		_tmp8_ = _tmp7_;
-		gtk_builder_add_from_file (_tmp6_, _tmp8_, &_inner_error_);
-		_g_free0 (_tmp8_);
+		GtkBuilder* _tmp5_;
+		gchar* _tmp6_ = NULL;
+		gchar* _tmp7_;
+		GtkBuilder* _tmp8_;
+		gchar* _tmp9_ = NULL;
+		gchar* _tmp10_;
+		GtkBuilder* _tmp11_;
+		ClutterScript* _tmp12_;
+		gchar* _tmp13_ = NULL;
+		gchar* _tmp14_;
+		_tmp5_ = self->priv->gtk_builder;
+		_tmp6_ = g_build_filename (PACKAGE_DATADIR, "cheese-actions.ui", NULL);
+		_tmp7_ = _tmp6_;
+		gtk_builder_add_from_file (_tmp5_, _tmp7_, &_inner_error_);
+		_g_free0 (_tmp7_);
 		if (_inner_error_ != NULL) {
 			goto __catch9_g_error;
 		}
-		_tmp9_ = self->priv->gtk_builder;
-		_tmp10_ = g_build_filename (PACKAGE_DATADIR, "cheese-main-window.ui", NULL);
-		_tmp11_ = _tmp10_;
-		gtk_builder_add_from_file (_tmp9_, _tmp11_, &_inner_error_);
-		_g_free0 (_tmp11_);
+		_tmp8_ = self->priv->gtk_builder;
+		_tmp9_ = g_build_filename (PACKAGE_DATADIR, "cheese-main-window.ui", NULL);
+		_tmp10_ = _tmp9_;
+		gtk_builder_add_from_file (_tmp8_, _tmp10_, &_inner_error_);
+		_g_free0 (_tmp10_);
 		if (_inner_error_ != NULL) {
 			goto __catch9_g_error;
 		}
-		_tmp12_ = self->priv->gtk_builder;
-		gtk_builder_connect_signals (_tmp12_, self);
-		_tmp13_ = self->priv->clutter_builder;
-		_tmp14_ = g_build_filename (PACKAGE_DATADIR, "cheese-viewport.json", NULL);
-		_tmp15_ = _tmp14_;
-		clutter_script_load_from_file (_tmp13_, _tmp15_, &_inner_error_);
-		_g_free0 (_tmp15_);
+		_tmp11_ = self->priv->gtk_builder;
+		gtk_builder_connect_signals (_tmp11_, self);
+		_tmp12_ = self->priv->clutter_builder;
+		_tmp13_ = g_build_filename (PACKAGE_DATADIR, "cheese-viewport.json", NULL);
+		_tmp14_ = _tmp13_;
+		clutter_script_load_from_file (_tmp12_, _tmp14_, &_inner_error_);
+		_g_free0 (_tmp14_);
 		if (_inner_error_ != NULL) {
 			goto __catch9_g_error;
 		}
@@ -4105,11 +4089,11 @@
 	__catch9_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp16_;
+		const gchar* _tmp15_;
 		err = _inner_error_;
 		_inner_error_ = NULL;
-		_tmp16_ = err->message;
-		g_error ("cheese-window.vala:1372: Error: %s", _tmp16_);
+		_tmp15_ = err->message;
+		g_error ("cheese-window.vala:1372: Error: %s", _tmp15_);
 		_g_error_free0 (err);
 	}
 	__finally9:
@@ -4118,215 +4102,215 @@
 		g_clear_error (&_inner_error_);
 		return;
 	}
-	_tmp17_ = self->priv->gtk_builder;
-	_tmp18_ = gtk_builder_get_object (_tmp17_, "mainbox_normal");
-	_tmp19_ = _g_object_ref0 (GTK_IS_GRID (_tmp18_) ? ((GtkGrid*) _tmp18_) : NULL);
+	_tmp16_ = self->priv->gtk_builder;
+	_tmp17_ = gtk_builder_get_object (_tmp16_, "mainbox_normal");
+	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, GTK_TYPE_GRID) ? ((GtkGrid*) _tmp17_) : NULL);
 	_g_object_unref0 (self->priv->main_vbox);
-	self->priv->main_vbox = _tmp19_;
-	_tmp20_ = self->priv->gtk_builder;
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "thumbnails");
-	_tmp22_ = _g_object_ref0 (GTK_IS_WIDGET (_tmp21_) ? ((GtkWidget*) _tmp21_) : NULL);
+	self->priv->main_vbox = _tmp18_;
+	_tmp19_ = self->priv->gtk_builder;
+	_tmp20_ = gtk_builder_get_object (_tmp19_, "thumbnails");
+	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, GTK_TYPE_WIDGET) ? ((GtkWidget*) _tmp20_) : NULL);
 	_g_object_unref0 (self->priv->thumbnails);
-	self->priv->thumbnails = _tmp22_;
-	_tmp23_ = self->priv->gtk_builder;
-	_tmp24_ = gtk_builder_get_object (_tmp23_, "viewport");
-	_tmp25_ = _g_object_ref0 (GTK_CLUTTER_IS_EMBED (_tmp24_) ? ((GtkClutterEmbed*) _tmp24_) : NULL);
+	self->priv->thumbnails = _tmp21_;
+	_tmp22_ = self->priv->gtk_builder;
+	_tmp23_ = gtk_builder_get_object (_tmp22_, "viewport");
+	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_clutter_embed_get_type ()) ? ((GtkClutterEmbed*) _tmp23_) : NULL);
 	_g_object_unref0 (self->priv->viewport_widget);
-	self->priv->viewport_widget = _tmp25_;
-	_tmp26_ = self->priv->viewport_widget;
-	_tmp27_ = gtk_clutter_embed_get_stage (_tmp26_);
-	_tmp28_ = _g_object_ref0 (CLUTTER_IS_STAGE (_tmp27_) ? ((ClutterStage*) _tmp27_) : NULL);
+	self->priv->viewport_widget = _tmp24_;
+	_tmp25_ = self->priv->viewport_widget;
+	_tmp26_ = gtk_clutter_embed_get_stage (_tmp25_);
+	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, clutter_stage_get_type ()) ? ((ClutterStage*) _tmp26_) : NULL);
 	_g_object_unref0 (self->priv->viewport);
-	self->priv->viewport = _tmp28_;
-	_tmp29_ = self->priv->gtk_builder;
-	_tmp30_ = gtk_builder_get_object (_tmp29_, "thumbnails_right");
-	_tmp31_ = _g_object_ref0 (GTK_IS_ALIGNMENT (_tmp30_) ? ((GtkAlignment*) _tmp30_) : NULL);
+	self->priv->viewport = _tmp27_;
+	_tmp28_ = self->priv->gtk_builder;
+	_tmp29_ = gtk_builder_get_object (_tmp28_, "thumbnails_right");
+	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, GTK_TYPE_ALIGNMENT) ? ((GtkAlignment*) _tmp29_) : NULL);
 	_g_object_unref0 (self->priv->thumbnails_right);
-	self->priv->thumbnails_right = _tmp31_;
-	_tmp32_ = self->priv->gtk_builder;
-	_tmp33_ = gtk_builder_get_object (_tmp32_, "thumbnails_bottom");
-	_tmp34_ = _g_object_ref0 (GTK_IS_ALIGNMENT (_tmp33_) ? ((GtkAlignment*) _tmp33_) : NULL);
+	self->priv->thumbnails_right = _tmp30_;
+	_tmp31_ = self->priv->gtk_builder;
+	_tmp32_ = gtk_builder_get_object (_tmp31_, "thumbnails_bottom");
+	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, GTK_TYPE_ALIGNMENT) ? ((GtkAlignment*) _tmp32_) : NULL);
 	_g_object_unref0 (self->priv->thumbnails_bottom);
-	self->priv->thumbnails_bottom = _tmp34_;
-	_tmp35_ = self->priv->gtk_builder;
-	_tmp36_ = gtk_builder_get_object (_tmp35_, "leave_fullscreen_button_bin");
-	_tmp37_ = _g_object_ref0 (GTK_IS_BOX (_tmp36_) ? ((GtkBox*) _tmp36_) : NULL);
+	self->priv->thumbnails_bottom = _tmp33_;
+	_tmp34_ = self->priv->gtk_builder;
+	_tmp35_ = gtk_builder_get_object (_tmp34_, "leave_fullscreen_button_bin");
+	_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, GTK_TYPE_BOX) ? ((GtkBox*) _tmp35_) : NULL);
 	_g_object_unref0 (self->priv->leave_fullscreen_button_container);
-	self->priv->leave_fullscreen_button_container = _tmp37_;
-	_tmp38_ = self->priv->gtk_builder;
-	_tmp39_ = gtk_builder_get_object (_tmp38_, "photo_toggle_button");
-	_tmp40_ = _g_object_ref0 (GTK_IS_TOGGLE_BUTTON (_tmp39_) ? ((GtkToggleButton*) _tmp39_) : NULL);
+	self->priv->leave_fullscreen_button_container = _tmp36_;
+	_tmp37_ = self->priv->gtk_builder;
+	_tmp38_ = gtk_builder_get_object (_tmp37_, "photo_toggle_button");
+	_tmp39_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp38_, GTK_TYPE_TOGGLE_BUTTON) ? ((GtkToggleButton*) _tmp38_) : NULL);
 	_g_object_unref0 (self->priv->photo_toggle_button);
-	self->priv->photo_toggle_button = _tmp40_;
-	_tmp41_ = self->priv->gtk_builder;
-	_tmp42_ = gtk_builder_get_object (_tmp41_, "video_toggle_button");
-	_tmp43_ = _g_object_ref0 (GTK_IS_TOGGLE_BUTTON (_tmp42_) ? ((GtkToggleButton*) _tmp42_) : NULL);
+	self->priv->photo_toggle_button = _tmp39_;
+	_tmp40_ = self->priv->gtk_builder;
+	_tmp41_ = gtk_builder_get_object (_tmp40_, "video_toggle_button");
+	_tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, GTK_TYPE_TOGGLE_BUTTON) ? ((GtkToggleButton*) _tmp41_) : NULL);
 	_g_object_unref0 (self->priv->video_toggle_button);
-	self->priv->video_toggle_button = _tmp43_;
-	_tmp44_ = self->priv->gtk_builder;
-	_tmp45_ = gtk_builder_get_object (_tmp44_, "burst_toggle_button");
-	_tmp46_ = _g_object_ref0 (GTK_IS_TOGGLE_BUTTON (_tmp45_) ? ((GtkToggleButton*) _tmp45_) : NULL);
+	self->priv->video_toggle_button = _tmp42_;
+	_tmp43_ = self->priv->gtk_builder;
+	_tmp44_ = gtk_builder_get_object (_tmp43_, "burst_toggle_button");
+	_tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp44_, GTK_TYPE_TOGGLE_BUTTON) ? ((GtkToggleButton*) _tmp44_) : NULL);
 	_g_object_unref0 (self->priv->burst_toggle_button);
-	self->priv->burst_toggle_button = _tmp46_;
-	_tmp47_ = self->priv->gtk_builder;
-	_tmp48_ = gtk_builder_get_object (_tmp47_, "take_action_button");
-	_tmp49_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp48_) ? ((GtkButton*) _tmp48_) : NULL);
+	self->priv->burst_toggle_button = _tmp45_;
+	_tmp46_ = self->priv->gtk_builder;
+	_tmp47_ = gtk_builder_get_object (_tmp46_, "take_action_button");
+	_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, GTK_TYPE_BUTTON) ? ((GtkButton*) _tmp47_) : NULL);
 	_g_object_unref0 (self->priv->take_action_button);
-	self->priv->take_action_button = _tmp49_;
-	_tmp50_ = self->priv->gtk_builder;
-	_tmp51_ = gtk_builder_get_object (_tmp50_, "take_action_button_internal_label");
-	_tmp52_ = _g_object_ref0 (GTK_IS_LABEL (_tmp51_) ? ((GtkLabel*) _tmp51_) : NULL);
+	self->priv->take_action_button = _tmp48_;
+	_tmp49_ = self->priv->gtk_builder;
+	_tmp50_ = gtk_builder_get_object (_tmp49_, "take_action_button_internal_label");
+	_tmp51_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, GTK_TYPE_LABEL) ? ((GtkLabel*) _tmp50_) : NULL);
 	_g_object_unref0 (self->priv->take_action_button_label);
-	self->priv->take_action_button_label = _tmp52_;
-	_tmp53_ = self->priv->gtk_builder;
-	_tmp54_ = gtk_builder_get_object (_tmp53_, "take_action_button_internal_image");
-	_tmp55_ = _g_object_ref0 (GTK_IS_IMAGE (_tmp54_) ? ((GtkImage*) _tmp54_) : NULL);
+	self->priv->take_action_button_label = _tmp51_;
+	_tmp52_ = self->priv->gtk_builder;
+	_tmp53_ = gtk_builder_get_object (_tmp52_, "take_action_button_internal_image");
+	_tmp54_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp53_, GTK_TYPE_IMAGE) ? ((GtkImage*) _tmp53_) : NULL);
 	_g_object_unref0 (self->priv->take_action_button_image);
-	self->priv->take_action_button_image = _tmp55_;
-	_tmp56_ = self->priv->gtk_builder;
-	_tmp57_ = gtk_builder_get_object (_tmp56_, "effects_toggle_button");
-	_tmp58_ = _g_object_ref0 (GTK_IS_TOGGLE_BUTTON (_tmp57_) ? ((GtkToggleButton*) _tmp57_) : NULL);
+	self->priv->take_action_button_image = _tmp54_;
+	_tmp55_ = self->priv->gtk_builder;
+	_tmp56_ = gtk_builder_get_object (_tmp55_, "effects_toggle_button");
+	_tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp56_, GTK_TYPE_TOGGLE_BUTTON) ? ((GtkToggleButton*) _tmp56_) : NULL);
 	_g_object_unref0 (self->priv->effects_toggle_button);
-	self->priv->effects_toggle_button = _tmp58_;
-	_tmp59_ = self->priv->gtk_builder;
-	_tmp60_ = gtk_builder_get_object (_tmp59_, "leave_fullscreen_button");
-	_tmp61_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp60_) ? ((GtkButton*) _tmp60_) : NULL);
+	self->priv->effects_toggle_button = _tmp57_;
+	_tmp58_ = self->priv->gtk_builder;
+	_tmp59_ = gtk_builder_get_object (_tmp58_, "leave_fullscreen_button");
+	_tmp60_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp59_, GTK_TYPE_BUTTON) ? ((GtkButton*) _tmp59_) : NULL);
 	_g_object_unref0 (self->priv->leave_fullscreen_button);
-	self->priv->leave_fullscreen_button = _tmp61_;
-	_tmp62_ = self->priv->gtk_builder;
-	_tmp63_ = gtk_builder_get_object (_tmp62_, "buttons_area");
-	_tmp64_ = _g_object_ref0 (GTK_IS_BOX (_tmp63_) ? ((GtkBox*) _tmp63_) : NULL);
+	self->priv->leave_fullscreen_button = _tmp60_;
+	_tmp61_ = self->priv->gtk_builder;
+	_tmp62_ = gtk_builder_get_object (_tmp61_, "buttons_area");
+	_tmp63_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp62_, GTK_TYPE_BOX) ? ((GtkBox*) _tmp62_) : NULL);
 	_g_object_unref0 (self->priv->buttons_area);
-	self->priv->buttons_area = _tmp64_;
-	_tmp65_ = self->priv->gtk_builder;
-	_tmp66_ = gtk_builder_get_object (_tmp65_, "thumbnail_popup");
-	_tmp67_ = _g_object_ref0 (GTK_IS_MENU (_tmp66_) ? ((GtkMenu*) _tmp66_) : NULL);
+	self->priv->buttons_area = _tmp63_;
+	_tmp64_ = self->priv->gtk_builder;
+	_tmp65_ = gtk_builder_get_object (_tmp64_, "thumbnail_popup");
+	_tmp66_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp65_, GTK_TYPE_MENU) ? ((GtkMenu*) _tmp65_) : NULL);
 	_g_object_unref0 (self->priv->thumbnail_popup);
-	self->priv->thumbnail_popup = _tmp67_;
-	_tmp68_ = self->priv->gtk_builder;
-	_tmp69_ = gtk_builder_get_object (_tmp68_, "countdown");
-	_tmp70_ = _g_object_ref0 (GTK_IS_ACTION (_tmp69_) ? ((GtkAction*) _tmp69_) : NULL);
+	self->priv->thumbnail_popup = _tmp66_;
+	_tmp67_ = self->priv->gtk_builder;
+	_tmp68_ = gtk_builder_get_object (_tmp67_, "countdown");
+	_tmp69_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp68_, GTK_TYPE_ACTION) ? ((GtkAction*) _tmp68_) : NULL);
 	_g_object_unref0 (self->priv->countdown_action);
-	self->priv->countdown_action = _tmp70_;
-	_tmp71_ = self->priv->gtk_builder;
-	_tmp72_ = gtk_builder_get_object (_tmp71_, "wide_mode");
-	_tmp73_ = _g_object_ref0 (GTK_IS_TOGGLE_ACTION (_tmp72_) ? ((GtkToggleAction*) _tmp72_) : NULL);
+	self->priv->countdown_action = _tmp69_;
+	_tmp70_ = self->priv->gtk_builder;
+	_tmp71_ = gtk_builder_get_object (_tmp70_, "wide_mode");
+	_tmp72_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp71_, GTK_TYPE_TOGGLE_ACTION) ? ((GtkToggleAction*) _tmp71_) : NULL);
 	_g_object_unref0 (self->priv->wide_mode_action);
-	self->priv->wide_mode_action = _tmp73_;
-	_tmp74_ = self->priv->gtk_builder;
-	_tmp75_ = gtk_builder_get_object (_tmp74_, "effects_page_next");
-	_tmp76_ = _g_object_ref0 (GTK_IS_ACTION (_tmp75_) ? ((GtkAction*) _tmp75_) : NULL);
+	self->priv->wide_mode_action = _tmp72_;
+	_tmp73_ = self->priv->gtk_builder;
+	_tmp74_ = gtk_builder_get_object (_tmp73_, "effects_page_next");
+	_tmp75_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp74_, GTK_TYPE_ACTION) ? ((GtkAction*) _tmp74_) : NULL);
 	_g_object_unref0 (self->priv->effects_page_next_action);
-	self->priv->effects_page_next_action = _tmp76_;
-	_tmp77_ = self->priv->gtk_builder;
-	_tmp78_ = gtk_builder_get_object (_tmp77_, "effects_page_prev");
-	_tmp79_ = _g_object_ref0 (GTK_IS_ACTION (_tmp78_) ? ((GtkAction*) _tmp78_) : NULL);
+	self->priv->effects_page_next_action = _tmp75_;
+	_tmp76_ = self->priv->gtk_builder;
+	_tmp77_ = gtk_builder_get_object (_tmp76_, "effects_page_prev");
+	_tmp78_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp77_, GTK_TYPE_ACTION) ? ((GtkAction*) _tmp77_) : NULL);
 	_g_object_unref0 (self->priv->effects_page_prev_action);
-	self->priv->effects_page_prev_action = _tmp79_;
-	_tmp80_ = self->priv->gtk_builder;
-	_tmp81_ = gtk_builder_get_object (_tmp80_, "share");
-	_tmp82_ = _g_object_ref0 (GTK_IS_ACTION (_tmp81_) ? ((GtkAction*) _tmp81_) : NULL);
+	self->priv->effects_page_prev_action = _tmp78_;
+	_tmp79_ = self->priv->gtk_builder;
+	_tmp80_ = gtk_builder_get_object (_tmp79_, "share");
+	_tmp81_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, GTK_TYPE_ACTION) ? ((GtkAction*) _tmp80_) : NULL);
 	_g_object_unref0 (self->priv->share_action);
-	self->priv->share_action = _tmp82_;
-	_tmp83_ = cheese_shareable_media_new (self);
+	self->priv->share_action = _tmp81_;
+	_tmp82_ = cheese_shareable_media_new (self);
 	_g_object_unref0 (self->priv->shareable_media);
-	self->priv->shareable_media = _tmp83_;
-	_tmp84_ = self->priv->photo_toggle_button;
-	_tmp85_ = _g_object_ref0 ((GtkButton*) _tmp84_);
-	_tmp86_ = self->priv->video_toggle_button;
-	_tmp87_ = _g_object_ref0 ((GtkButton*) _tmp86_);
-	_tmp88_ = self->priv->burst_toggle_button;
-	_tmp89_ = _g_object_ref0 ((GtkButton*) _tmp88_);
-	_tmp90_ = self->priv->take_action_button;
-	_tmp91_ = _g_object_ref0 (_tmp90_);
-	_tmp92_ = self->priv->effects_toggle_button;
-	_tmp93_ = _g_object_ref0 ((GtkButton*) _tmp92_);
-	_tmp94_ = self->priv->leave_fullscreen_button;
-	_tmp95_ = _g_object_ref0 (_tmp94_);
-	_tmp96_ = g_new0 (GtkButton*, 6 + 1);
-	_tmp96_[0] = _tmp85_;
-	_tmp96_[1] = _tmp87_;
-	_tmp96_[2] = _tmp89_;
-	_tmp96_[3] = _tmp91_;
-	_tmp96_[4] = _tmp93_;
-	_tmp96_[5] = _tmp95_;
+	self->priv->shareable_media = _tmp82_;
+	_tmp83_ = self->priv->photo_toggle_button;
+	_tmp84_ = _g_object_ref0 ((GtkButton*) _tmp83_);
+	_tmp85_ = self->priv->video_toggle_button;
+	_tmp86_ = _g_object_ref0 ((GtkButton*) _tmp85_);
+	_tmp87_ = self->priv->burst_toggle_button;
+	_tmp88_ = _g_object_ref0 ((GtkButton*) _tmp87_);
+	_tmp89_ = self->priv->take_action_button;
+	_tmp90_ = _g_object_ref0 (_tmp89_);
+	_tmp91_ = self->priv->effects_toggle_button;
+	_tmp92_ = _g_object_ref0 ((GtkButton*) _tmp91_);
+	_tmp93_ = self->priv->leave_fullscreen_button;
+	_tmp94_ = _g_object_ref0 (_tmp93_);
+	_tmp95_ = g_new0 (GtkButton*, 6 + 1);
+	_tmp95_[0] = _tmp84_;
+	_tmp95_[1] = _tmp86_;
+	_tmp95_[2] = _tmp88_;
+	_tmp95_[3] = _tmp90_;
+	_tmp95_[4] = _tmp92_;
+	_tmp95_[5] = _tmp94_;
 	self->priv->buttons = (_vala_array_free (self->priv->buttons, self->priv->buttons_length1, (GDestroyNotify) g_object_unref), NULL);
-	self->priv->buttons = _tmp96_;
+	self->priv->buttons = _tmp95_;
 	self->priv->buttons_length1 = 6;
 	self->priv->_buttons_size_ = self->priv->buttons_length1;
-	_tmp97_ = self->priv->clutter_builder;
-	_tmp98_ = clutter_script_get_object (_tmp97_, "video_preview");
-	_tmp99_ = _g_object_ref0 (CLUTTER_IS_TEXTURE (_tmp98_) ? ((ClutterTexture*) _tmp98_) : NULL);
+	_tmp96_ = self->priv->clutter_builder;
+	_tmp97_ = clutter_script_get_object (_tmp96_, "video_preview");
+	_tmp98_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp97_, clutter_texture_get_type ()) ? ((ClutterTexture*) _tmp97_) : NULL);
 	_g_object_unref0 (self->priv->video_preview);
-	self->priv->video_preview = _tmp99_;
-	_tmp100_ = self->priv->clutter_builder;
-	_tmp101_ = clutter_script_get_object (_tmp100_, "viewport_layout");
-	_tmp102_ = _g_object_ref0 (CLUTTER_IS_BOX (_tmp101_) ? ((ClutterBox*) _tmp101_) : NULL);
+	self->priv->video_preview = _tmp98_;
+	_tmp99_ = self->priv->clutter_builder;
+	_tmp100_ = clutter_script_get_object (_tmp99_, "viewport_layout");
+	_tmp101_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp100_, clutter_box_get_type ()) ? ((ClutterBox*) _tmp100_) : NULL);
 	_g_object_unref0 (self->priv->viewport_layout);
-	self->priv->viewport_layout = _tmp102_;
-	_tmp103_ = self->priv->clutter_builder;
-	_tmp104_ = clutter_script_get_object (_tmp103_, "viewport_layout_manager");
-	_tmp105_ = _g_object_ref0 (CLUTTER_IS_BIN_LAYOUT (_tmp104_) ? ((ClutterBinLayout*) _tmp104_) : NULL);
+	self->priv->viewport_layout = _tmp101_;
+	_tmp102_ = self->priv->clutter_builder;
+	_tmp103_ = clutter_script_get_object (_tmp102_, "viewport_layout_manager");
+	_tmp104_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp103_, clutter_bin_layout_get_type ()) ? ((ClutterBinLayout*) _tmp103_) : NULL);
 	_g_object_unref0 (self->priv->viewport_layout_manager);
-	self->priv->viewport_layout_manager = _tmp105_;
-	_tmp106_ = self->priv->clutter_builder;
-	_tmp107_ = clutter_script_get_object (_tmp106_, "countdown_layer");
-	_tmp108_ = _g_object_ref0 (CLUTTER_IS_TEXT (_tmp107_) ? ((ClutterText*) _tmp107_) : NULL);
+	self->priv->viewport_layout_manager = _tmp104_;
+	_tmp105_ = self->priv->clutter_builder;
+	_tmp106_ = clutter_script_get_object (_tmp105_, "countdown_layer");
+	_tmp107_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp106_, clutter_text_get_type ()) ? ((ClutterText*) _tmp106_) : NULL);
 	_g_object_unref0 (self->priv->countdown_layer);
-	self->priv->countdown_layer = _tmp108_;
-	_tmp109_ = self->priv->clutter_builder;
-	_tmp110_ = clutter_script_get_object (_tmp109_, "background");
-	_tmp111_ = _g_object_ref0 (CLUTTER_IS_RECTANGLE (_tmp110_) ? ((ClutterRectangle*) _tmp110_) : NULL);
+	self->priv->countdown_layer = _tmp107_;
+	_tmp108_ = self->priv->clutter_builder;
+	_tmp109_ = clutter_script_get_object (_tmp108_, "background");
+	_tmp110_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp109_, clutter_rectangle_get_type ()) ? ((ClutterRectangle*) _tmp109_) : NULL);
 	_g_object_unref0 (self->priv->background_layer);
-	self->priv->background_layer = _tmp111_;
-	_tmp112_ = self->priv->clutter_builder;
-	_tmp113_ = clutter_script_get_object (_tmp112_, "error_layer");
-	_tmp114_ = _g_object_ref0 (CLUTTER_IS_TEXT (_tmp113_) ? ((ClutterText*) _tmp113_) : NULL);
+	self->priv->background_layer = _tmp110_;
+	_tmp111_ = self->priv->clutter_builder;
+	_tmp112_ = clutter_script_get_object (_tmp111_, "error_layer");
+	_tmp113_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp112_, clutter_text_get_type ()) ? ((ClutterText*) _tmp112_) : NULL);
 	_g_object_unref0 (self->priv->error_layer);
-	self->priv->error_layer = _tmp114_;
-	_tmp115_ = self->priv->clutter_builder;
-	_tmp116_ = clutter_script_get_object (_tmp115_, "timeout_layer");
-	_tmp117_ = _g_object_ref0 (CLUTTER_IS_TEXT (_tmp116_) ? ((ClutterText*) _tmp116_) : NULL);
+	self->priv->error_layer = _tmp113_;
+	_tmp114_ = self->priv->clutter_builder;
+	_tmp115_ = clutter_script_get_object (_tmp114_, "timeout_layer");
+	_tmp116_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp115_, clutter_text_get_type ()) ? ((ClutterText*) _tmp115_) : NULL);
 	_g_object_unref0 (self->priv->timeout_layer);
-	self->priv->timeout_layer = _tmp117_;
+	self->priv->timeout_layer = _tmp116_;
+	_tmp117_ = self->priv->video_preview;
+	clutter_texture_set_keep_aspect_ratio (_tmp117_, TRUE);
 	_tmp118_ = self->priv->video_preview;
-	clutter_texture_set_keep_aspect_ratio (_tmp118_, TRUE);
-	_tmp119_ = self->priv->video_preview;
-	clutter_actor_set_request_mode ((ClutterActor*) _tmp119_, CLUTTER_REQUEST_HEIGHT_FOR_WIDTH);
-	_tmp120_ = self->priv->viewport;
-	_tmp121_ = self->priv->background_layer;
-	clutter_container_add_actor ((ClutterContainer*) _tmp120_, (ClutterActor*) _tmp121_);
-	_tmp122_ = self->priv->viewport_layout;
-	_tmp123_ = self->priv->viewport_layout_manager;
-	clutter_box_set_layout_manager (_tmp122_, (ClutterLayoutManager*) _tmp123_);
-	_tmp124_ = self->priv->viewport;
-	_tmp125_ = self->priv->viewport_layout;
-	clutter_container_add_actor ((ClutterContainer*) _tmp124_, (ClutterActor*) _tmp125_);
-	_tmp126_ = self->priv->viewport;
-	_tmp127_ = self->priv->timeout_layer;
-	clutter_container_add_actor ((ClutterContainer*) _tmp126_, (ClutterActor*) _tmp127_);
-	_tmp128_ = self->priv->viewport;
-	g_signal_connect_object ((ClutterActor*) _tmp128_, "allocation-changed", (GCallback) _cheese_main_window_on_stage_resize_clutter_actor_allocation_changed, self, 0);
-	_tmp129_ = cheese_thumb_view_new ();
-	_tmp130_ = g_object_ref_sink (_tmp129_);
+	clutter_actor_set_request_mode ((ClutterActor*) _tmp118_, CLUTTER_REQUEST_HEIGHT_FOR_WIDTH);
+	_tmp119_ = self->priv->viewport;
+	_tmp120_ = self->priv->background_layer;
+	clutter_container_add_actor ((ClutterContainer*) _tmp119_, (ClutterActor*) _tmp120_);
+	_tmp121_ = self->priv->viewport_layout;
+	_tmp122_ = self->priv->viewport_layout_manager;
+	clutter_box_set_layout_manager (_tmp121_, (ClutterLayoutManager*) _tmp122_);
+	_tmp123_ = self->priv->viewport;
+	_tmp124_ = self->priv->viewport_layout;
+	clutter_container_add_actor ((ClutterContainer*) _tmp123_, (ClutterActor*) _tmp124_);
+	_tmp125_ = self->priv->viewport;
+	_tmp126_ = self->priv->timeout_layer;
+	clutter_container_add_actor ((ClutterContainer*) _tmp125_, (ClutterActor*) _tmp126_);
+	_tmp127_ = self->priv->viewport;
+	g_signal_connect_object ((ClutterActor*) _tmp127_, "allocation-changed", (GCallback) _cheese_main_window_on_stage_resize_clutter_actor_allocation_changed, self, 0);
+	_tmp128_ = cheese_thumb_view_new ();
+	g_object_ref_sink (_tmp128_);
 	_g_object_unref0 (self->priv->thumb_view);
-	self->priv->thumb_view = _tmp130_;
-	_tmp131_ = self->priv->thumb_view;
-	_tmp132_ = eog_thumb_nav_new ((GtkWidget*) _tmp131_, FALSE);
-	_tmp133_ = g_object_ref_sink (_tmp132_);
+	self->priv->thumb_view = _tmp128_;
+	_tmp129_ = self->priv->thumb_view;
+	_tmp130_ = eog_thumb_nav_new ((GtkWidget*) _tmp129_, FALSE);
+	g_object_ref_sink (_tmp130_);
 	_g_object_unref0 (self->priv->thumb_nav);
-	self->priv->thumb_nav = _tmp133_;
+	self->priv->thumb_nav = _tmp130_;
 	{
-		GtkCssProvider* _tmp134_;
-		gchar* _tmp135_ = NULL;
-		gchar* _tmp136_;
-		_tmp134_ = gtk_css_provider_new ();
+		GtkCssProvider* _tmp131_;
+		gchar* _tmp132_ = NULL;
+		gchar* _tmp133_;
+		_tmp131_ = gtk_css_provider_new ();
 		_g_object_unref0 (css);
-		css = _tmp134_;
-		_tmp135_ = g_build_filename (PACKAGE_DATADIR, "cheese.css", NULL);
-		_tmp136_ = _tmp135_;
-		gtk_css_provider_load_from_path (css, _tmp136_, &_inner_error_);
-		_g_free0 (_tmp136_);
+		css = _tmp131_;
+		_tmp132_ = g_build_filename (PACKAGE_DATADIR, "cheese.css", NULL);
+		_tmp133_ = _tmp132_;
+		gtk_css_provider_load_from_path (css, _tmp133_, &_inner_error_);
+		_g_free0 (_tmp133_);
 		if (_inner_error_ != NULL) {
 			goto __catch10_g_error;
 		}
@@ -4335,15 +4319,15 @@
 	__catch10_g_error:
 	{
 		GError* e = NULL;
-		FILE* _tmp137_;
-		GError* _tmp138_;
-		const gchar* _tmp139_;
+		FILE* _tmp134_;
+		GError* _tmp135_;
+		const gchar* _tmp136_;
 		e = _inner_error_;
 		_inner_error_ = NULL;
-		_tmp137_ = stdout;
-		_tmp138_ = e;
-		_tmp139_ = _tmp138_->message;
-		fprintf (_tmp137_, "Error: %s\n", _tmp139_);
+		_tmp134_ = stdout;
+		_tmp135_ = e;
+		_tmp136_ = _tmp135_->message;
+		fprintf (_tmp134_, "Error: %s\n", _tmp136_);
 		_g_error_free0 (e);
 	}
 	__finally10:
@@ -4353,35 +4337,35 @@
 		g_clear_error (&_inner_error_);
 		return;
 	}
-	_tmp140_ = self->priv->thumb_view;
-	_tmp141_ = gtk_widget_get_style_context ((GtkWidget*) _tmp140_);
-	_tmp142_ = _g_object_ref0 (_tmp141_);
+	_tmp137_ = self->priv->thumb_view;
+	_tmp138_ = gtk_widget_get_style_context ((GtkWidget*) _tmp137_);
+	_tmp139_ = _g_object_ref0 (_tmp138_);
 	_g_object_unref0 (context);
-	context = _tmp142_;
-	_tmp143_ = gdk_screen_get_default ();
-	gtk_window_set_screen ((GtkWindow*) self, _tmp143_);
-	_tmp144_ = context;
-	_tmp145_ = gtk_window_get_screen ((GtkWindow*) self);
-	_tmp146_ = _tmp145_;
-	gtk_style_context_add_provider_for_screen (_tmp146_, (GtkStyleProvider*) css, (guint) GTK_STYLE_PROVIDER_PRIORITY_USER);
-	_tmp147_ = self->priv->thumb_view;
-	g_signal_connect_object ((GtkWidget*) _tmp147_, "button-press-event", (GCallback) _cheese_main_window_on_thumbnail_mouse_button_press_gtk_widget_button_press_event, self, 0);
-	_tmp148_ = self->priv->main_vbox;
-	gtk_container_add ((GtkContainer*) self, (GtkWidget*) _tmp148_);
-	_tmp149_ = self->priv->main_vbox;
-	gtk_widget_show_all ((GtkWidget*) _tmp149_);
-	_tmp150_ = self->priv->viewport_widget;
-	gtk_widget_realize ((GtkWidget*) _tmp150_);
-	_tmp151_ = self->priv->wide_mode_action;
-	_tmp152_ = self->priv->settings;
-	_tmp153_ = g_settings_get_boolean (_tmp152_, "wide-mode");
-	gtk_toggle_action_set_active (_tmp151_, _tmp153_);
-	_tmp154_ = self->priv->settings;
-	_tmp155_ = g_settings_get_boolean (_tmp154_, "wide-mode");
-	if (!_tmp155_) {
-		GtkToggleAction* _tmp156_;
-		_tmp156_ = self->priv->wide_mode_action;
-		gtk_toggle_action_toggled (_tmp156_);
+	context = _tmp139_;
+	_tmp140_ = gdk_screen_get_default ();
+	gtk_window_set_screen ((GtkWindow*) self, _tmp140_);
+	_tmp141_ = context;
+	_tmp142_ = gtk_window_get_screen ((GtkWindow*) self);
+	_tmp143_ = _tmp142_;
+	gtk_style_context_add_provider_for_screen (_tmp143_, (GtkStyleProvider*) css, (guint) GTK_STYLE_PROVIDER_PRIORITY_USER);
+	_tmp144_ = self->priv->thumb_view;
+	g_signal_connect_object ((GtkWidget*) _tmp144_, "button-press-event", (GCallback) _cheese_main_window_on_thumbnail_mouse_button_press_gtk_widget_button_press_event, self, 0);
+	_tmp145_ = self->priv->main_vbox;
+	gtk_container_add ((GtkContainer*) self, (GtkWidget*) _tmp145_);
+	_tmp146_ = self->priv->main_vbox;
+	gtk_widget_show_all ((GtkWidget*) _tmp146_);
+	_tmp147_ = self->priv->viewport_widget;
+	gtk_widget_realize ((GtkWidget*) _tmp147_);
+	_tmp148_ = self->priv->wide_mode_action;
+	_tmp149_ = self->priv->settings;
+	_tmp150_ = g_settings_get_boolean (_tmp149_, "wide-mode");
+	gtk_toggle_action_set_active (_tmp148_, _tmp150_);
+	_tmp151_ = self->priv->settings;
+	_tmp152_ = g_settings_get_boolean (_tmp151_, "wide-mode");
+	if (!_tmp152_) {
+		GtkToggleAction* _tmp153_;
+		_tmp153_ = self->priv->wide_mode_action;
+		gtk_toggle_action_toggled (_tmp153_);
 	}
 	cheese_main_window_set_mode (self, CHEESE_MEDIA_MODE_PHOTO);
 	cheese_main_window_setup_effects_selector (self);
@@ -4561,7 +4545,7 @@
 
 static void cheese_main_window_finalize (GObject* obj) {
 	CheeseMainWindow * self;
-	self = CHEESE_MAIN_WINDOW (obj);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CHEESE_TYPE_MAIN_WINDOW, CheeseMainWindow);
 	_g_object_unref0 (self->priv->gtk_builder);
 	_g_object_unref0 (self->priv->clutter_builder);
 	_g_object_unref0 (self->priv->settings);
diff -Nru cheese-3.5.4/tests_cheese_test_camera_vala.stamp cheese-3.5.5/tests_cheese_test_camera_vala.stamp
--- cheese-3.5.4/tests_cheese_test_camera_vala.stamp	2012-07-16 20:08:48.000000000 +0000
+++ cheese-3.5.5/tests_cheese_test_camera_vala.stamp	2012-02-20 20:11:19.000000000 +0000
@@ -1 +0,0 @@
-stamp
diff -Nru cheese-3.5.4/tests_cheese_test_chooser_vala.stamp cheese-3.5.5/tests_cheese_test_chooser_vala.stamp
--- cheese-3.5.4/tests_cheese_test_chooser_vala.stamp	2012-07-16 20:08:48.000000000 +0000
+++ cheese-3.5.5/tests_cheese_test_chooser_vala.stamp	2012-02-20 20:11:20.000000000 +0000
@@ -1 +0,0 @@
-stamp
diff -Nru cheese-3.5.4/tests_cheese_test_flash_vala.stamp cheese-3.5.5/tests_cheese_test_flash_vala.stamp
--- cheese-3.5.4/tests_cheese_test_flash_vala.stamp	2012-07-16 20:08:54.000000000 +0000
+++ cheese-3.5.5/tests_cheese_test_flash_vala.stamp	2012-02-20 20:11:21.000000000 +0000
@@ -1 +0,0 @@
-stamp
diff -Nru cheese-3.5.4/tests_cheese_test_monitor_vala.stamp cheese-3.5.5/tests_cheese_test_monitor_vala.stamp
--- cheese-3.5.4/tests_cheese_test_monitor_vala.stamp	2012-07-16 20:08:55.000000000 +0000
+++ cheese-3.5.5/tests_cheese_test_monitor_vala.stamp	2012-02-20 20:11:22.000000000 +0000
@@ -1 +0,0 @@
-stamp
diff -Nru cheese-3.5.4/tests_cheese_test_widget_vala.stamp cheese-3.5.5/tests_cheese_test_widget_vala.stamp
--- cheese-3.5.4/tests_cheese_test_widget_vala.stamp	2012-07-16 20:09:01.000000000 +0000
+++ cheese-3.5.5/tests_cheese_test_widget_vala.stamp	2012-02-20 20:11:23.000000000 +0000
@@ -1 +0,0 @@
-stamp
diff -Nru cheese-3.5.4/tests_test_libcheese_gtk_vala.stamp cheese-3.5.5/tests_test_libcheese_gtk_vala.stamp
--- cheese-3.5.4/tests_test_libcheese_gtk_vala.stamp	2012-07-16 20:09:01.000000000 +0000
+++ cheese-3.5.5/tests_test_libcheese_gtk_vala.stamp	2012-02-20 20:11:24.000000000 +0000
@@ -1 +0,0 @@
-stamp
diff -Nru cheese-3.5.4/tests_test_libcheese_vala.stamp cheese-3.5.5/tests_test_libcheese_vala.stamp
--- cheese-3.5.4/tests_test_libcheese_vala.stamp	2012-07-16 20:09:07.000000000 +0000
+++ cheese-3.5.5/tests_test_libcheese_vala.stamp	2012-02-20 20:11:24.000000000 +0000
@@ -1 +0,0 @@
-stamp
diff -Nru cheese-3.5.4/tests_test_webcam_button_vala.stamp cheese-3.5.5/tests_test_webcam_button_vala.stamp
--- cheese-3.5.4/tests_test_webcam_button_vala.stamp	2012-07-16 20:09:08.000000000 +0000
+++ cheese-3.5.5/tests_test_webcam_button_vala.stamp	2011-10-31 11:02:06.000000000 +0000
@@ -1 +0,0 @@
-stamp