Merge lp:~noskcaj/ubuntu/utopic/cheese/3.12.2 into lp:ubuntu/utopic/cheese

[Jackson Doak]

New upstream bugfix release. Drops our patches and updates translations

[Daniel Holbach (dholbach)]

Conflict adding file data/headerbar.ui. Moved existing file to data/headerbar.ui.moved.

review: Needs Fixing

[Jackson Doak (noskcaj)]

Could this be uploaded manually please? I can't get the bzr branch to behave

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

107. By Jackson Doak on 2014-06-11

* New upstream release.
* Drop 0001-Use-avatar-chooser-headerbar-only-when-requested.patch,
  0002-Use-a-traditional-title-bar-when-requested.patch. Fixed upstream

106. By Jackson Doak on 2014-06-11

decommit patches

=== removed directory '.pc/0001-Use-avatar-chooser-headerbar-only-when-requested.patch'
=== removed directory '.pc/0001-Use-avatar-chooser-headerbar-only-when-requested.patch/libcheese'
=== removed file '.pc/0001-Use-avatar-chooser-headerbar-only-when-requested.patch/libcheese/cheese-avatar-chooser.c'
--- .pc/0001-Use-avatar-chooser-headerbar-only-when-requested.patch/libcheese/cheese-avatar-chooser.c	2014-05-23 11:12:02 +0000
+++ .pc/0001-Use-avatar-chooser-headerbar-only-when-requested.patch/libcheese/cheese-avatar-chooser.c	1970-01-01 00:00:00 +0000
@@ -1,180 +0,0 @@
-/*
- * Copyright © 2009 Bastien Nocera <[e-mail]>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "cheese-config.h"
-
-#include <glib/gi18n-lib.h>
-#include <canberra-gtk.h>
-
-#include "cheese-camera.h"
-#include "cheese-widget-private.h"
-#include "cheese-flash.h"
-#include "cheese-avatar-chooser.h"
-#include "cheese-avatar-widget.h"
-#include "um-crop-area.h"
-
-/**
- * SECTION:cheese-avatar-chooser
- * @short_description: A photo capture dialog for avatars
- * @stability: Unstable
- * @include: cheese/cheese-avatar-chooser.h
- *
- * #CheeseAvatarChooser presents a simple window to the user for taking a photo
- * for use as an avatar.
- */
-
-enum
-{
-  LAST_SIGNAL
-};
-
-enum
-{
-  PROP_0,
-  PROP_PIXBUF,
-  PROP_LAST
-};
-
-enum
-{
-  WIDGET_PAGE = 0,
-  IMAGE_PAGE  = 1,
-};
-
-struct _CheeseAvatarChooserPrivate
-{
-  GtkWidget *widget;
-};
-
-static GParamSpec *properties[PROP_LAST];
-
-G_DEFINE_TYPE_WITH_PRIVATE (CheeseAvatarChooser, cheese_avatar_chooser, GTK_TYPE_DIALOG);
-
-static void
-update_select_button (CheeseAvatarWidget  *widget,
-                      GParamSpec          *pspec,
-                      CheeseAvatarChooser *chooser)
-{
-  GdkPixbuf *pixbuf;
-
-  g_object_get (G_OBJECT (widget), "pixbuf", &pixbuf, NULL);
-  gtk_dialog_set_response_sensitive (GTK_DIALOG (chooser),
-                                     GTK_RESPONSE_ACCEPT,
-                                     pixbuf != NULL);
-  if (pixbuf)
-    g_object_unref (pixbuf);
-}
-
-static void
-cheese_avatar_chooser_init (CheeseAvatarChooser *chooser)
-{
-  CheeseAvatarChooserPrivate *priv = chooser->priv = cheese_avatar_chooser_get_instance_private (chooser);
-
-  gtk_dialog_add_buttons (GTK_DIALOG (chooser),
-                          _("_Cancel"),
-                          GTK_RESPONSE_REJECT,
-                          _("_Select"),
-                          GTK_RESPONSE_ACCEPT,
-                          NULL);
-  gtk_window_set_title (GTK_WINDOW (chooser), _("Take a Photo"));
-
-  gtk_dialog_set_response_sensitive (GTK_DIALOG (chooser),
-                                     GTK_RESPONSE_ACCEPT,
-                                     FALSE);
-
-  g_object_set (G_OBJECT (gtk_dialog_get_action_area (GTK_DIALOG (chooser))), "margin", 8, NULL);
-
-  priv->widget = cheese_avatar_widget_new ();
-  gtk_widget_show (priv->widget);
-  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (chooser))),
-                      priv->widget,
-                      TRUE, TRUE, 0);
-
-  g_signal_connect (G_OBJECT (priv->widget), "notify::pixbuf",
-                    G_CALLBACK (update_select_button), chooser);
-
-}
-
-static void
-cheese_avatar_chooser_get_property (GObject *object, guint prop_id,
-                                    GValue *value, GParamSpec *pspec)
-{
-  CheeseAvatarChooserPrivate *priv = ((CheeseAvatarChooser *) object)->priv;
-
-  switch (prop_id)
-  {
-    case PROP_PIXBUF:
-      g_value_set_object (value, cheese_avatar_widget_get_picture (CHEESE_AVATAR_WIDGET (priv->widget)));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-cheese_avatar_chooser_class_init (CheeseAvatarChooserClass *klass)
-{
-  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->get_property = cheese_avatar_chooser_get_property;
-
-  /**
-   * CheeseAvatarChooser:pixbuf:
-   *
-   * A #GdkPixbuf object representing the cropped area of the picture, or %NULL.
-   */
-  properties[PROP_PIXBUF] = g_param_spec_object ("pixbuf",
-                                                 "Pixbuf",
-                                                 "A #GdkPixbuf object representing the cropped area of the picture, or %NULL.",
-                                                 GDK_TYPE_PIXBUF,
-                                                 G_PARAM_READABLE);
-
-  g_object_class_install_properties (object_class, PROP_LAST, properties);
-}
-
-/**
- * cheese_avatar_chooser_new:
- *
- * Creates a new #CheeseAvatarChooser dialogue.
- *
- * Returns: a #CheeseAvatarChooser
- */
-GtkWidget *
-cheese_avatar_chooser_new (void)
-{
-  return g_object_new (CHEESE_TYPE_AVATAR_CHOOSER, NULL);
-}
-
-/**
- * cheese_avatar_chooser_get_picture:
- * @chooser: a #CheeseAvatarChooser dialogue
- *
- * Returns the portion of image selected through the builtin cropping tool,
- * after a picture has been captured on the webcam.
- *
- * Return value: a #GdkPixbuf object, or %NULL if no picture has been taken yet
- */
-GdkPixbuf *
-cheese_avatar_chooser_get_picture (CheeseAvatarChooser *chooser)
-{
-  g_return_val_if_fail (CHEESE_IS_AVATAR_CHOOSER (chooser), NULL);
-
-  return cheese_avatar_widget_get_picture (CHEESE_AVATAR_WIDGET (chooser->priv->widget));
-}

=== removed directory '.pc/0002-Use-a-traditional-title-bar-when-requested.patch'
=== removed file '.pc/0002-Use-a-traditional-title-bar-when-requested.patch/Makefile.am'
--- .pc/0002-Use-a-traditional-title-bar-when-requested.patch/Makefile.am	2014-05-23 11:12:02 +0000
+++ .pc/0002-Use-a-traditional-title-bar-when-requested.patch/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,561 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-SUBDIRS = po help
-
-enum_data = \
-	libcheese/cheese-enums.c \
-	libcheese/cheese-enums.h
-
-cheese_enum_headers = \
-	$(top_srcdir)/libcheese/cheese-widget.h
-
-libcheese/cheese-enums.c: $(cheese_enum_headers) libcheese/cheese-enums.h
-	$(AM_V_GEN)$(GLIB_MKENUMS) \
-		--fhead "#include \"cheese-enums.h\"\n\n" \
-		--fprod "/* enumerations from \"@filename@\" */\n" \
-		--fprod "#include \"@filename@\"\n" \
-		--vhead "GType\n@enum_name@_get_type (void)\n{\n" \
-		--vhead "  static GType type = 0;\n\n" \
-		--vhead "  if (!type)\n  {\n" \
-		--vhead "    static const G@Type@Value _@enum_name@_values[] = {" \
-		--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-		--vtail "      { 0, NULL, NULL }\n    };\n\n" \
-		--vtail "    type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n  }\n\n" \
-		--vtail "  return type;\n}\n\n" \
-		$(cheese_enum_headers) > $@
-
-libcheese/cheese-enums.h: $(cheese_enum_headers)
-	$(AM_V_GEN)$(GLIB_MKENUMS) \
-		--fhead "#ifndef CHEESE_ENUMS_H_\n" \
-		--fhead "#define CHEESE_ENUMS_H_\n\n" \
-		--fhead "#include <glib-object.h>\n\n" \
-		--fhead "G_BEGIN_DECLS\n\n" \
-		--fprod "/* enumerations from @filename@ */\n" \
-		--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n" \
-		--vhead "#define CHEESE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-		--ftail "G_END_DECLS\n\n" \
-		--ftail "#endif /* CHEESE_ENUMS_H_ */" \
-		$(cheese_enum_headers) > $@
-
-AM_CPPFLAGS = \
-	-DDATADIR=\"$(datadir)\" \
-	-DPREFIX=\""$(prefix)"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DLIBDIR=\""$(libdir)"\" \
-	-DPACKAGE_DATADIR=\""$(pkgdatadir)"\" \
-	-DPACKAGE_LOCALEDIR=\""$(datadir)/locale"\" \
-	-DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
-	-I$(top_builddir) \
-	$(CHEESE_CFLAGS) \
-	$(CHEESE_GTK_FLAGS) \
-	$(CHEESE_WFLAGS) \
-	$(WARN_CFLAGS)
-
-AM_VALAFLAGS = \
-	--target-glib=2.38 \
-	--thread \
-	--vapidir $(top_srcdir)/src/vapi \
-	--gresources $(top_srcdir)/data/cheese.gresource.xml \
-	--pkg config \
-	--pkg posix \
-	--pkg gtk+-3.0 \
-	--pkg gmodule-2.0 \
-	--pkg clutter-1.0 \
-	--pkg clutter-gtk-1.0 \
-	--pkg gstreamer-1.0 \
-	--pkg libcanberra-gtk \
-	--pkg libcanberra \
-	--pkg eogthumbnav \
-	--pkg cheese-thumbview \
-	--pkg cheese-common \
-	--pkg gdk-x11-3.0 \
-	--pkg gio-2.0
-
-lib_LTLIBRARIES = libcheese.la libcheese-gtk.la
-
-libcheese_gtk_la_CFLAGS = \
-	$(CHEESE_CFLAGS) \
-	$(CHEESE_GTK_CFLAGS) \
-	$(CHEESE_WFLAGS)
-
-libcheese_gtk_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-DG_LOG_DOMAIN=\"cheese-gtk\" \
-	-I$(top_builddir)/libcheese \
-	-I$(top_srcdir)/libcheese \
-	-I$(top_srcdir)/src
-
-libcheese_gtk_la_LIBADD = \
-	libcheese.la \
-	$(CHEESE_LIBS) \
-	$(CHEESE_GTK_LIBS)
-
-libcheese_gtk_la_LDFLAGS = \
-	-version-info $(LIBCHEESE_GTK_LT_VERSION) \
-	-export-symbols $(top_srcdir)/libcheese/cheese-gtk.symbols \
-	-no-undefined \
-	$(AM_LDFLAGS)
-
-libcheese_gtk_la_SOURCES = \
-	libcheese/cheese-avatar-chooser.c \
-	libcheese/cheese-avatar-widget.c \
-	libcheese/totem-aspect-frame.c \
-	libcheese/cheese-flash.c \
-	libcheese/cheese-gtk.c \
-	libcheese/cheese-widget.c \
-	libcheese/um-crop-area.c
-
-noinst_libcheese_gtk_headers = \
-	libcheese/totem-aspect-frame.h \
-	libcheese/cheese-avatar-chooser.h \
-	libcheese/cheese-avatar-widget.h \
-	libcheese/cheese-flash.h \
-	libcheese/cheese-widget.h \
-	libcheese/cheese-widget-private.h \
-	libcheese/um-crop-area.h
-
-libcheese_la_CFLAGS = \
-	$(CHEESE_CFLAGS) \
-	$(CHEESE_GTK_CFLAGS) \
-	$(CHEESE_WFLAGS)
-
-libcheese_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-DG_LOG_DOMAIN=\"cheese\" \
-	-I$(top_builddir)/libcheese \
-	-I$(top_srcdir)/libcheese
-
-libcheese_la_LIBADD = \
-	$(CHEESE_LIBS)
-
-libcheese_la_LDFLAGS = \
-	-version-info $(LIBCHEESE_LT_VERSION) \
-	$(AM_LDFLAGS)
-
-libcheese_la_SOURCES = \
-	libcheese/cheese-enums.c \
-	libcheese/cheese-camera.c \
-	libcheese/cheese-camera-device.c \
-	libcheese/cheese-camera-device-monitor.c \
-	libcheese/cheese-effect.c \
-	libcheese/cheese-fileutil.c \
-	libcheese/cheese.c
-
-noinst_libcheese_headers = \
-	libcheese/cheese-camera.h \
-	libcheese/cheese-camera-device.h \
-	libcheese/cheese-camera-device-monitor.h \
-	libcheese/cheese-effect.h \
-	libcheese/cheese-fileutil.h
-
-# FIXME when we have a .pc file, and sonames
-cheesedir = $(includedir)/cheese
-cheese_HEADERS = \
-	libcheese/cheese-avatar-widget.h \
-	libcheese/cheese-avatar-chooser.h \
-	libcheese/cheese-camera.h \
-	libcheese/cheese-camera-device.h \
-	libcheese/cheese-camera-device-monitor.h \
-	libcheese/cheese-effect.h \
-	libcheese/cheese-gtk.h \
-	libcheese/cheese.h \
-	libcheese/cheese-widget.h
-
-if HAVE_INTROSPECTION
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_srcdir) --warn-all
-
-INTROSPECTION_GIRS = Cheese-3.0.gir
-
-Cheese-3.0.gir: libcheese.la
-Cheese_3_0_gir_CFLAGS = \
-	-I$(top_srcdir)/libcheese \
-	-I$(top_builddir)/libcheese \
-	$(CHEESE_CFLAGS)
-Cheese_3_0_gir_FILES = \
-	$(libcheese_la_SOURCES) \
-	$(noinst_libcheese_headers) \
-	libcheese/cheese-enums.h
-Cheese_3_0_gir_INCLUDES = \
-	GObject-2.0 \
-	GLib-2.0 \
-	Gst-1.0 \
-	GstBase-1.0 \
-	cairo-1.0 \
-	Clutter-1.0 \
-	GdkPixbuf-2.0
-Cheese_3_0_gir_LIBS = libcheese.la
-Cheese_3_0_gir_SCANNERFLAGS = --verbose --warn-all --pkg-export cheese
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = Cheese-3.0.typelib
-endif
-
-noinst_resource_files = \
-	data/cheese.css \
-	data/cheese-viewport.json \
-	data/cheese-appmenu.ui \
-	data/cheese-main-window.ui \
-	data/cheese-prefs.ui \
-	data/pixmaps/cheese-1.svg \
-	data/pixmaps/cheese-2.svg \
-	data/pixmaps/cheese-3.svg \
-	data/pixmaps/thumbnail-frame.png
-
-src/cheese-resource.c src/cheese-resource.h: data/cheese.gresource.xml Makefile $(noinst_resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/data --generate --c-name cheese $<
-
-bin_PROGRAMS = cheese
-
-nodist_cheese_SOURCES = \
-	src/cheese-resource.c
-
-# cheese-main.vala must go at the end of the Vala sources.
-cheese_SOURCES = \
-	src/cheese-application.vala \
-	src/cheese-countdown.vala \
-	src/cheese-effects-manager.vala \
-	src/cheese-preferences.vala \
-	src/cheese-window.vala \
-	src/cheese-main.vala \
-	src/thumbview/cheese-thumb-view.c \
-	src/thumbview/cheese-thumbnail.c \
-	src/thumbview/eog-thumb-nav.c
-
-nodist_cheese_HEADERS = \
-	src/cheese-resource.h
-
-noinst_HEADERS = \
-	src/thumbview/cheese-thumb-view.h \
-	src/thumbview/cheese-thumbnail.h \
-	src/thumbview/eog-thumb-nav.h
-
-cheese_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(CHEESE_CFLAGS) \
-	$(CHEESE_GTK_CFLAGS) \
-	-include $(top_builddir)/$(CONFIG_HEADER) \
-	-I$(top_srcdir)/libcheese \
-	-I$(top_srcdir)/src
-
-cheese_CFLAGS = -export-dynamic -w
-
-cheese_LDADD = \
-	libcheese.la \
-	libcheese-gtk.la \
-	$(CHEESE_LIBS) \
-	$(CHEESE_GTK_LIBS)
-
-EXAMPLES = \
-	tests/cheese-test-camera \
-	tests/cheese-test-chooser \
-	tests/cheese-test-flash \
-	tests/cheese-test-monitor \
-	tests/cheese-test-widget
-
-if HAVE_XTEST
-noinst_PROGRAMS = \
-	$(EXAMPLES) \
-	tests/test-webcam-button
-else
-noinst_PROGRAMS = $(EXAMPLES)
-endif
-
-EXAMPLES_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(CHEESE_GTK_CFLAGS) \
-	-I$(top_srcdir)/libcheese
-
-tests_cheese_test_camera_SOURCES = tests/cheese-test-camera.c
-tests_cheese_test_chooser_SOURCES = tests/cheese-test-chooser.c
-tests_cheese_test_flash_SOURCES = tests/cheese-test-flash.c
-tests_cheese_test_monitor_SOURCES = tests/cheese-test-monitor.c
-tests_cheese_test_widget_SOURCES = tests/cheese-test-widget.c
-tests_test_webcam_button_SOURCES = tests/test-webcam-button.c
-
-tests_cheese_test_camera_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
-tests_cheese_test_chooser_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
-tests_cheese_test_flash_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
-tests_cheese_test_monitor_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
-tests_cheese_test_widget_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
-tests_test_webcam_button_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
-
-tests_cheese_test_camera_LDADD = \
-	$(CHEESE_LIBS) \
-	$(CHEESE_GTK_LIBS) \
-	libcheese.la
-tests_cheese_test_chooser_LDADD = \
-	$(CHEESE_LIBS) \
-	$(CHEESE_GTK_LIBS) \
-	libcheese.la \
-	libcheese-gtk.la
-tests_cheese_test_flash_LDADD = \
-	$(CHEESE_LIBS) \
-	$(CHEESE_GTK_LIBS) \
-	libcheese.la \
-	libcheese-gtk.la
-tests_cheese_test_monitor_LDADD = \
-	$(CHEESE_LIBS) \
-	$(CHEESE_GTK_LIBS) \
-	libcheese.la \
-	libcheese-gtk.la
-tests_cheese_test_widget_LDADD = \
-	$(CHEESE_LIBS) \
-	$(CHEESE_GTK_LIBS) \
-	libcheese.la \
-	libcheese-gtk.la
-tests_test_webcam_button_LDADD = $(XTEST_LIBS)
-
-@INTLTOOL_DESKTOP_RULE@
-desktopdir = $(datadir)/applications
-desktop_in_files = data/cheese.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-@APPDATA_XML_RULES@
-@INTLTOOL_XML_RULE@
-appdata_in_files = data/cheese.appdata.xml.in
-appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
-
-@GSETTINGS_RULES@
-gsettings_SCHEMAS = data/org.gnome.Cheese.gschema.xml
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
-	data/cheese.pc \
-	data/cheese-gtk.pc
-
-iconthemedir = $(datadir)/icons/hicolor
-
-appsicon16dir = $(iconthemedir)/16x16/apps
-appsicon22dir = $(iconthemedir)/22x22/apps
-appsicon24dir = $(iconthemedir)/24x24/apps
-appsicon32dir = $(iconthemedir)/32x32/apps
-appsicon48dir = $(iconthemedir)/48x48/apps
-appsicon256dir = $(iconthemedir)/256x256/apps
-
-dist_appsicon16_DATA = data/icons/16x16/cheese.png
-dist_appsicon22_DATA = data/icons/22x22/cheese.png
-dist_appsicon24_DATA = data/icons/24x24/cheese.png
-dist_appsicon32_DATA = data/icons/32x32/cheese.png
-dist_appsicon48_DATA = data/icons/48x48/cheese.png
-dist_appsicon256_DATA = data/icons/256x256/cheese.png
-
-update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
-
-install-data-hook: install-update-icon-cache
-uninstall-hook: uninstall-update-icon-cache
-	touch libcheese_la_vala.stamp
-
-install-update-icon-cache:
-	$(AM_V_at)$(POST_INSTALL)
-	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
-
-uninstall-update-icon-cache:
-	$(AM_V_at)$(POST_UNINSTALL)
-	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
-
-# Tests.
-check_PROGRAMS = \
-	tests/test-libcheese \
-	tests/test-libcheese-gtk
-
-tests_test_libcheese_gtk_SOURCES = \
-	libcheese/um-crop-area.c \
-	tests/test-libcheese-gtk.c
-tests_test_libcheese_gtk_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
-tests_test_libcheese_gtk_LDADD = \
-	$(CHEESE_LIBS) \
-	$(CHEESE_GTK_LIBS) \
-	libcheese-gtk.la \
-	libcheese.la
-
-tests_test_libcheese_SOURCES = \
-	tests/test-libcheese.c
-tests_test_libcheese_CPPFLAGS = $(EXAMPLES_CPPFLAGS)
-tests_test_libcheese_LDADD = \
-	$(CHEESE_LIBS) \
-	libcheese.la
-
-if CHEESE_ENABLE_TESTS
-# Not automake built-in TESTS_ENVIRONMENT!
-TEST_ENVIRONMENT = MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
-
-# test: run all tests.
-test: $(check_PROGRAMS)
-	$(AM_V_at)$(TEST_ENVIRONMENT) $(GTESTER) --verbose $(check_PROGRAMS)
-
-# test-report: run tests and generate report.
-# perf-report: run tests with -m perf and generate report.
-# full-report: like test-report: with -m perf and -m slow.
-test-report perf-report full-report: $(check_PROGRAMS)
-	$(AM_V_at)test -z "$(check_PROGRAMS)" || { \
-	  case $@ in \
-	  test-report) test_options="-k";; \
-	  perf-report) test_options="-k -m=perf";; \
-	  full-report) test_options="-k -m=perf -m=slow";; \
-	  esac ; \
-	  $(TEST_ENVIRONMENT) $(GTESTER) --verbose $$test_options -o test-log.xml $(check_PROGRAMS) ; \
-	  if test -d "$(top_srcdir)/.git" ; then \
-	    REVISION=`git describe` ; \
-	  else \
-	    REVISION=$(PACKAGE_VERSION) ; \
-	  fi ; \
-	  echo '<?xml version="1.0"?>' > $@.xml ; \
-	  echo '<report-collection>' >> $@.xml ; \
-	  echo '<info>' >> $@.xml ; \
-	  echo '  <package>$(PACKAGE_NAME)</package>' >> $@.xml ; \
-	  echo '  <version>$(PACKAGE_VERSION)</version>' >> $@.xml ; \
-	  echo "  <revision>$$REVISION</revision>" >> $@.xml ; \
-	  echo '</info>' >> $@.xml ; \
-	  sed '1,1s/^<?xml\b[^>?]*?>//' < test-log.xml >> $@.xml ; \
-	  rm test-log.xml ; \
-	  echo >> $@.xml ; \
-	  echo '</report-collection>' >> $@.xml ; \
-	  $(GTESTER_REPORT) --version 2>/dev/null 1>&2 ; test "$$?" != 0 || $(GTESTER_REPORT) $@.xml >$@.html ; \
-	}
-else # !CHEESE_ENABLE_TESTS
-test:
-	echo "Test run disabled due to the lack of GLib testing utilities"
-endif
-
-# Code coverage reporting.
-if CHEESE_ENABLE_LCOV
-# Depend on full-report so that all the tests are run.
-lcov: full-report
-	$(AM_V_at)$(LCOV) --base-directory $(top_builddir) \
-		--directory $(top_builddir)/libcheese --capture \
-		--output-file cheese-lcov.info --test-name CHEESE \
-		--no-checksum --compat-libtool
-	$(AM_V_at)LANG=C $(LCOV_GENHTML) --prefix $(top_builddir) \
-		--output-directory cheese-lcov --title "Cheese code coverage" \
-		--legend --show-details cheese-lcov.info
-
-lcov-clean:
-	$(AM_V_at)$(LCOV) --directory $(top_builddir) -z
-	$(AM_V_at)rm -rf cheese-lcov.info cheese-lcov
-	$(AM_V_at)find . -name '*.gcda' -exec rm -f {} +
-else # !CHEESE_ENABLE_LCOV
-lcov:
-	$(AM_V_at)echo "Code coverage reporting not available"
-
-lcov-clean:
-	$(AM_V_at)rm -rf cheese-lcov.info cheese-lcov
-	$(AM_V_at)find . -name '*.gcda' -exec rm -f {} +
-endif
-
-# gtk-doc
-gtkdoc_builddir = $(top_builddir)/docs/reference
-gtkdoc_distdir = $(top_distdir)/docs/reference
-gtkdoc_srcdir = $(top_srcdir)/docs/reference
-
-all-local: $(bin_PROGRAMS)
-	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) all
-# run make test as part of make check.
-check-local: test
-	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFlAGS) check
-clean-local: lcov-clean
-	cd $(gtkdoc_builddir) && if test -e Makefile ; then \
-		$(MAKE) $(AM_MAKEFLAGS) clean ; \
-	fi
-	find . -name '*.gcno' -exec rm -f {} +
-distclean-local:
-	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) distclean
-docs: $(lib_LTLIBRARIES)
-	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) docs
-install-data-local:
-	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) install-data
-uninstall-local:
-	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) uninstall
-
-dist-hook: git-changelog-hook
-	$(MKDIR_P) $(gtkdoc_distdir)
-	cp $(gtkdoc_srcdir)/Makefile.am $(gtkdoc_srcdir)/Makefile.in $(gtkdoc_distdir)
-	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) \
-	  distdir="../../$(gtkdoc_distdir)" \
-	  top_distdir="../../$(top_distdir)" \
-	  dist-hook
-
-dist_noinst_DATA = \
-	ChangeLog.pre-git \
-	$(desktop_in_files) \
-	$(gsettings_SCHEMAS) \
-	$(noinst_resource_files) \
-	$(appdata_in_files) \
-	data/cheese.gresource.xml \
-	build-aux/test-driver \
-	$(gtkdoc_srcdir)/cheese-docs.xml \
-	$(gtkdoc_srcdir)/cheese-sections.txt \
-	$(gtkdoc_srcdir)/cheese.xml \
-	$(gtkdoc_srcdir)/version.xml.in \
-	gtk-doc.make \
-	intltool-extract.in \
-	intltool-merge.in \
-	intltool-update.in \
-	$(noinst_libcheese_headers) \
-	$(noinst_libcheese_gtk_headers) \
-	libcheese/cheese-gtk.symbols \
-	m4/introspection.m4 \
-	src/vapi/cheese-common.deps \
-	src/vapi/cheese-common.vapi \
-	src/vapi/cheese-thumbview.vapi \
-	src/vapi/config.vapi \
-	src/vapi/eogthumbnav.vapi
-
-dist_noinst_SCRIPTS = \
-	autogen.sh
-
-CLEANFILES = \
-	$(appdata_XML) \
-	$(desktop_DATA) \
-	$(pkgconfig_DATA) \
-	$(enum_data) \
-	$(gir_DATA) \
-	$(typelib_DATA) \
-	src/cheese-resource.c \
-	src/cheese-resource.h
-
-DISTCLEANFILES = \
-	libcheese_la_vala.stamp \
-	intltool-extract \
-	intltool-merge \
-	intltool-update \
-	po/.intltool-merge-cache
-
-MAINTAINERCLEANFILES = \
-	build-aux/compile \
-	build-aux/config.guess \
-	build-aux/config.sub \
-	build-aux/depcomp \
-	build-aux/install-sh \
-	build-aux/ltmain.sh \
-	build-aux/missing \
-	build-aux/test-driver \
-	aclocal.m4 \
-	config.h.n \
-	$(gsettings_SCHEMAS:.xml=.valid) \
-	mkinstalldirs \
-	omf.make \
-	xmldocs.make
-
-DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-appdata-check \
-	--enable-gtk-doc \
-	--enable-introspection \
-	--enable-man
-
-CHANGELOG_START = 2.26.0
-
-git-changelog-hook:
-	$(AM_V_at)if $(top_srcdir)/build-aux/missing --run git \
-		--git-dir=$(top_srcdir)/.git --work-tree=$(top_srcdir) log \
-		--stat -M -C --name-status --no-color $(CHANGELOG_START).. \
-		| fmt --split-only >.ChangeLog.tmp; \
-	then mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \
-	else rm -f .ChangeLog.tmp; exit 1; fi
-
-.PHONY: docs git-changelog-hook test test-report perf-report full-report
-.PHONY: lcov lcov-clean

=== removed directory '.pc/0002-Use-a-traditional-title-bar-when-requested.patch/data'
=== removed file '.pc/0002-Use-a-traditional-title-bar-when-requested.patch/data/cheese-main-window.ui'
--- .pc/0002-Use-a-traditional-title-bar-when-requested.patch/data/cheese-main-window.ui	2014-05-23 11:12:02 +0000
+++ .pc/0002-Use-a-traditional-title-bar-when-requested.patch/data/cheese-main-window.ui	1970-01-01 00:00:00 +0000
@@ -1,236 +0,0 @@
-<?xml version="1.0"?>
-<interface domain="cheese">
-  <requires lib="gtk+" version="3.10"/>
-    <template class="CheeseMainWindow" parent="GtkApplicationWindow">
-        <child type="titlebar">
-  <object class="GtkHeaderBar" id="header_bar">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Take a Photo</property>
-    <property name="show-close-button">True</property>
-    <style>
-      <class name="titlebar"/>
-    </style>
-  </object>
-        </child>
-        <child>
-  <object class="GtkBox" id="main_vbox">
-    <property name="orientation">vertical</property>
-    <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="visible">True</property>
-    <child>
-      <object class="GtkBox" id="content_area">
-        <property name="vexpand">True</property>
-        <property name="hexpand">True</property>
-        <property name="orientation">horizontal</property>
-        <property name="visible">True</property>
-        <child>
-          <object class="GtkBox" id="view_area">
-            <property name="orientation">vertical</property>
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkClutterEmbed" id="viewport_widget">
-                <property name="vexpand">True</property>
-                <property name="hexpand">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK</property>
-                <property name="height_request">450</property>
-                <property name="width_request">600</property>
-                <property name="visible">True</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkAlignment" id="action_area_alignment">
-                <property name="hexpand">True</property>
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkBox" id="buttons_area">
-                    <property name="border-width">6</property>
-                    <property name="orientation">horizontal</property>
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkBox" id="mode_toggle_buttons">
-                        <property name="orientation">horizontal</property>
-                        <property name="visible">True</property>
-                        <style>
-                          <class name="linked"/>
-                        </style>
-                        <child>
-                          <object class="GtkToggleButton" id="photo_toggle_button">
-                            <property name="action-name">app.mode</property>
-                            <property name="action-target">"photo"</property>
-                            <property name="tooltip_text" translatable="yes">Photo mode</property>
-                            <property name="label" translatable="yes">Photo</property>
-                            <property name="visible">True</property>
-                            <property name="visible">True</property>
-                            <style>
-                              <class name="text-button"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="video_toggle_button">
-                            <property name="action-name">app.mode</property>
-                            <property name="action-target">"video"</property>
-                            <property name="tooltip_text" translatable="yes">Video mode</property>
-                            <property name="label" translatable="yes">Video</property>
-                            <property name="visible">True</property>
-                            <style>
-                              <class name="text-button"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="burst_toggle_button">
-                            <property name="action-name">app.mode</property>
-                            <property name="action-target">"burst"</property>
-                            <property name="tooltip_text" translatable="yes">Photo burst mode</property>
-                            <property name="label" translatable="yes">Burst</property>
-                            <property name="visible">True</property>
-                            <style>
-                              <class name="text-button"/>
-                            </style>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="action_button_alignment">
-                        <property name="xscale">0</property>
-                        <property name="yscale">0</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">False</property>
-                        <property name="visible">True</property>
-                        <child>
-                          <object class="GtkButton" id="take_action_button">
-                            <property name="action-name">app.shoot</property>
-                            <property name="tooltip_text" translatable="yes">Take a photo using a webcam</property>
-                            <property name="visible">True</property>
-                            <style>
-                              <class name="image-button"/>
-                            </style>
-                            <child>
-                              <object class="GtkImage" id="take_action_button_image">
-                                <property name="icon-name">camera-web-symbolic</property>
-                                <property name="visible">True</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="effects_actions_pack">
-                        <property name="orientation">horizontal</property>
-                        <property name="visible">True</property>
-                        <style>
-                          <class name="linked"/>
-                        </style>
-                        <child>
-                          <object class="GtkButton" id="effects_prev_page_button">
-                            <property name="action-name">win.effects-previous</property>
-                            <property name="tooltip_text" translatable="yes">Navigate to the previous page of effects</property>
-                            <property name="visible">True</property>
-                            <child>
-                              <object class="GtkImage" id="effects_prev_page_button_image">
-                                <property name="visible">True</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="effects_toggle_button">
-                            <property name="vexpand">False</property>
-                            <property name="hexpand">False</property>
-                            <property name="action-name">app.effects</property>
-                            <property name="tooltip_text" translatable="yes">Effects</property>
-                            <property name="visible">True</property>
-                            <child>
-                              <object class="GtkBox" id="effects_toggle_button_internal_hbox">
-                                <property name="orientation">horizontal</property>
-                                <property name="spacing">2</property>
-                                <property name="visible">True</property>
-                                <child>
-                                  <object class="GtkLabel" id="effects_toggle_button_internal_label">
-                                    <property name="label" translatable="yes">_Effects</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="visible">True</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="effects_next_page_button">
-                            <property name="use-action-appearance">False</property>
-                            <property name="action-name">win.effects-next</property>
-                            <property name="tooltip_text" translatable="yes">Navigate to the next page of effects</property>
-                            <property name="visible">True</property>
-                            <child>
-                              <object class="GtkImage" id="effects_next_page_button_image">
-                                <property name="visible">True</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="leave_fullscreen_button_box">
-                        <property name="orientation">horizontal</property>
-                        <property name="visible">False</property>
-                        <property name="no-show-all">True</property>
-                        <property name="hexpand">False</property>
-                        <child>
-                          <object class="GtkButton" id="leave_fullscreen_button">
-                            <property name="use-action-appearance">False</property>
-                            <property name="action-name">app.fullscreen</property>
-                            <property name="tooltip_text" translatable="yes">Leave fullscreen mode and go back to windowed mode</property>
-                            <child>
-                              <object class="GtkImage" id="fullscreen_button_internal_image">
-                                <property name="icon-name">view-restore-symbolic</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAlignment" id="thumbnails_right">
-            <property name="visible">False</property>
-            <property name="vexpand">False</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="thumbnails_bottom">
-        <property name="visible">False</property>
-        <property name="vexpand">False</property>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-    </child>
-  </object>
-        </child>
-    </template>
-  <object class="GtkSizeGroup" id="button_sizegroup">
-    <property name="mode">GTK_SIZE_GROUP_HORIZONTAL</property>
-    <widgets>
-      <widget name="take_action_button"/>
-      <widget name="effects_actions_pack"/>
-    </widgets>
-  </object>
-</interface>

=== removed file '.pc/0002-Use-a-traditional-title-bar-when-requested.patch/data/cheese.gresource.xml'
--- .pc/0002-Use-a-traditional-title-bar-when-requested.patch/data/cheese.gresource.xml	2014-05-23 11:12:02 +0000
+++ .pc/0002-Use-a-traditional-title-bar-when-requested.patch/data/cheese.gresource.xml	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-    <gresource prefix='/org/gnome/Cheese'>
-        <file>cheese.css</file>
-        <file>cheese-viewport.json</file>
-        <file preprocess="xml-stripblanks">cheese-appmenu.ui</file>
-        <file preprocess="xml-stripblanks">cheese-main-window.ui</file>
-        <file preprocess="xml-stripblanks">cheese-prefs.ui</file>
-        <file>pixmaps/cheese-1.svg</file>
-        <file>pixmaps/cheese-2.svg</file>
-        <file>pixmaps/cheese-3.svg</file>
-        <file preprocess="to-pixdata">pixmaps/thumbnail-frame.png</file>
-    </gresource>
-</gresources>
-

=== removed file '.pc/0002-Use-a-traditional-title-bar-when-requested.patch/data/headerbar.ui'
=== removed directory '.pc/0002-Use-a-traditional-title-bar-when-requested.patch/src'
=== removed file '.pc/0002-Use-a-traditional-title-bar-when-requested.patch/src/cheese-window.vala'
--- .pc/0002-Use-a-traditional-title-bar-when-requested.patch/src/cheese-window.vala	2014-05-23 11:12:02 +0000
+++ .pc/0002-Use-a-traditional-title-bar-when-requested.patch/src/cheese-window.vala	1970-01-01 00:00:00 +0000
@@ -1,1348 +0,0 @@
-/*
- * Copyright © 2010 Yuvaraj Pandian T <[e-mail]>
- * Copyright © 2010 daniel g. siegel <[e-mail]>
- * Copyright © 2008 Filippo Argiolas <[e-mail]>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-using Gtk;
-using Gdk;
-using GtkClutter;
-using Clutter;
-using Config;
-using Eog;
-using Gst;
-using CanberraGtk;
-
-const int FULLSCREEN_TIMEOUT_INTERVAL = 5 * 1000;
-const uint EFFECTS_PER_PAGE = 9;
-
-[GtkTemplate (ui = "/org/gnome/Cheese/cheese-main-window.ui")]
-public class Cheese.MainWindow : Gtk.ApplicationWindow
-{
-    private const GLib.ActionEntry actions[] = {
-        { "file-open", on_file_open },
-        { "file-saveas", on_file_saveas },
-        { "file-trash", on_file_trash },
-        { "file-delete", on_file_delete },
-        { "effects-next", on_effects_next },
-        { "effects-previous", on_effects_previous }
-    };
-
-    private MediaMode current_mode;
-
-    private Clutter.Script clutter_builder;
-
-    [GtkChild]
-    private Gtk.HeaderBar header_bar;
-
-    private GLib.Settings settings;
-
-    [GtkChild]
-    private GtkClutter.Embed viewport_widget;
-    [GtkChild]
-    private Gtk.Widget main_vbox;
-    private Eog.ThumbNav thumb_nav;
-    private Cheese.ThumbView thumb_view;
-    [GtkChild]
-    private Gtk.Alignment thumbnails_right;
-    [GtkChild]
-    private Gtk.Alignment thumbnails_bottom;
-    [GtkChild]
-    private Gtk.Widget leave_fullscreen_button_box;
-    [GtkChild]
-    private Gtk.Button take_action_button;
-    [GtkChild]
-    private Gtk.Image take_action_button_image;
-    [GtkChild]
-    private Gtk.ToggleButton effects_toggle_button;
-    [GtkChild]
-    private Gtk.Image effects_prev_page_button_image;
-    [GtkChild]
-    private Gtk.Image effects_next_page_button_image;
-    [GtkChild]
-    private Gtk.Widget buttons_area;
-    private Gtk.Menu thumbnail_popup;
-
-    private Clutter.Stage viewport;
-    private Clutter.Actor viewport_layout;
-    private Clutter.Texture video_preview;
-    private Clutter.BinLayout viewport_layout_manager;
-    private Clutter.Text countdown_layer;
-    private Clutter.Actor background_layer;
-    private Clutter.Text error_layer;
-    private Clutter.Text timeout_layer;
-
-  private Clutter.Actor current_effects_grid;
-  private uint current_effects_page = 0;
-  private List<Clutter.Actor> effects_grids;
-
-  private bool is_fullscreen;
-  private bool is_wide_mode;
-  private bool is_recording;       /* Video Recording Flag */
-  private bool is_bursting;
-  private bool is_effects_selector_active;
-  private bool action_cancelled;
-    private bool was_maximized;
-
-  private Cheese.Camera   camera;
-  private Cheese.FileUtil fileutil;
-  private Cheese.Flash    flash;
-
-  private Cheese.EffectsManager    effects_manager;
-
-  private Cheese.Effect selected_effect;
-
-  /**
-   * Responses from the delete files confirmation dialog.
-   *
-   * @param SKIP skip a single file
-   * @param SKIP_ALL skill all following files
-   */
-  enum DeleteResponse
-  {
-    SKIP = 1,
-    SKIP_ALL = 2
-  }
-
-    public MainWindow (Gtk.Application application)
-    {
-        GLib.Object (application: application);
-
-        if (get_direction () == Gtk.TextDirection.RTL)
-        {
-            effects_prev_page_button_image.icon_name = "go-previous-rtl-symbolic";
-            effects_next_page_button_image.icon_name = "go-next-rtl-symbolic";
-        }
-        else
-        {
-            effects_prev_page_button_image.icon_name = "go-previous-symbolic";
-            effects_next_page_button_image.icon_name = "go-next-symbolic";
-        }
-    }
-
-    private bool on_window_state_change_event (Gtk.Widget widget,
-                                               Gdk.EventWindowState event)
-    {
-        was_maximized = (((event.new_window_state - event.changed_mask)
-                          & Gdk.WindowState.MAXIMIZED) != 0);
-
-        window_state_event.disconnect (on_window_state_change_event);
-        return false;
-    }
-
-    /**
-    * Popup a context menu when right-clicking on a thumbnail.
-    *
-    * @param iconview the thumbnail view that emitted the signal
-    * @param event the event
-    * @return false to allow further processing of the event, true to indicate
-    * that the event was handled completely
-    */
-    public bool on_thumbnail_button_press_event (Gtk.Widget iconview,
-                                                 Gdk.EventButton event)
-    {
-        Gtk.TreePath path;
-        path = thumb_view.get_path_at_pos ((int) event.x, (int) event.y);
-
-        if (path == null)
-        {
-            return false;
-        }
-
-        if (!thumb_view.path_is_selected (path))
-        {
-            thumb_view.unselect_all ();
-            thumb_view.select_path (path);
-            thumb_view.set_cursor (path, null, false);
-        }
-
-        if (event.type == Gdk.EventType.BUTTON_PRESS)
-        {
-            Gdk.Event* button_press = (Gdk.Event*)(&event);
-
-            if (button_press->triggers_context_menu ())
-            {
-                thumbnail_popup.popup (null, thumb_view, null, event.button,
-                                       event.time);
-            }
-            else if (event.type == Gdk.EventType.2BUTTON_PRESS)
-            {
-                on_file_open ();
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-  /**
-   * Open an image associated with a thumbnail in the default application.
-   */
-  private void on_file_open ()
-  {
-    string filename, uri;
-
-    Gdk.Screen screen;
-    filename = thumb_view.get_selected_image ();
-
-    if (filename == null)
-      return;                     /* Nothing selected. */
-
-    try
-    {
-      uri    = GLib.Filename.to_uri (filename);
-      screen = this.get_screen ();
-      Gtk.show_uri (screen, uri, Gtk.get_current_event_time ());
-    }
-    catch (Error err)
-    {
-      MessageDialog error_dialog = new MessageDialog (this,
-                                                      Gtk.DialogFlags.MODAL |
-                                                      Gtk.DialogFlags.DESTROY_WITH_PARENT,
-                                                      Gtk.MessageType.ERROR,
-                                                      Gtk.ButtonsType.OK,
-                                                      _("Could not open %s"),
-                                                      filename);
-
-      error_dialog.run ();
-      error_dialog.destroy ();
-    }
-  }
-
-  /**
-   * Delete the requested image or images in the thumbview from storage.
-   *
-   * A confirmation dialog is shown to the user before deleting any files.
-   */
-  private void on_file_delete ()
-  {
-    int response;
-    int error_response;
-    bool skip_all_errors = false;
-
-    var files = thumb_view.get_selected_images_list ();
-    var files_length = files.length ();
-
-    var confirmation_dialog = new MessageDialog.with_markup (this,
-      Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
-      Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE,
-      GLib.ngettext("Are you sure you want to permanently delete the file?",
-        "Are you sure you want to permanently delete %d files?",
-        files_length), files_length);
-    confirmation_dialog.add_button (_("_Cancel"), Gtk.ResponseType.CANCEL);
-    confirmation_dialog.add_button (_("_Delete"), Gtk.ResponseType.ACCEPT);
-    confirmation_dialog.format_secondary_text ("%s",
-      GLib.ngettext("If you delete an item, it will be permanently lost",
-        "If you delete the items, they will be permanently lost",
-        files_length));
-
-    response = confirmation_dialog.run ();
-    if (response == Gtk.ResponseType.ACCEPT)
-    {
-      foreach (var file in files)
-      {
-        if (file == null)
-          return;
-
-        try
-        {
-          file.delete (null);
-        }
-        catch (Error err)
-        {
-          warning ("Unable to delete file: %s", err.message);
-
-          if (!skip_all_errors) {
-            var error_dialog = new MessageDialog (this,
-              Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
-              Gtk.MessageType.ERROR, Gtk.ButtonsType.NONE,
-              "Could not delete %s", file.get_path ());
-
-            error_dialog.add_button (_("_Cancel"), Gtk.ResponseType.CANCEL);
-            error_dialog.add_button ("Skip", DeleteResponse.SKIP);
-            error_dialog.add_button ("Skip all", DeleteResponse.SKIP_ALL);
-
-            error_response = error_dialog.run ();
-            if (error_response == DeleteResponse.SKIP_ALL) {
-              skip_all_errors = true;
-            } else if (error_response == Gtk.ResponseType.CANCEL) {
-              break;
-            }
-
-            error_dialog.destroy ();
-          }
-        }
-      }
-    }
-    confirmation_dialog.destroy ();
-  }
-
-  /**
-   * Move the requested image in the thumbview to the trash.
-   *
-   * A confirmation dialog is shown to the user before moving the file.
-   */
-  private void on_file_trash ()
-  {
-    File file;
-
-    GLib.List<GLib.File> files = thumb_view.get_selected_images_list ();
-
-    for (int i = 0; i < files.length (); i++)
-    {
-      file = files<GLib.File>.nth (i).data;
-      if (file == null)
-        return;
-
-      try
-      {
-        file.trash (null);
-      }
-      catch (Error err)
-      {
-        MessageDialog error_dialog = new MessageDialog (this,
-                                                        Gtk.DialogFlags.MODAL |
-                                                        Gtk.DialogFlags.DESTROY_WITH_PARENT,
-                                                        Gtk.MessageType.ERROR,
-                                                        Gtk.ButtonsType.OK,
-                                                        _("Could not move %s to trash"),
-                                                        file.get_path ());
-
-        error_dialog.run ();
-        error_dialog.destroy ();
-      }
-    }
-  }
-
-  /**
-   * Save the selected file in the thumbview to an alternate storage location.
-   *
-   * A file chooser dialog is shown to the user, asking where the file should
-   * be saved and the filename.
-   */
-  private void on_file_saveas ()
-  {
-    string            filename, basename;
-    FileChooserDialog save_as_dialog;
-    int               response;
-
-    filename = thumb_view.get_selected_image ();
-    if (filename == null)
-      return;                    /* Nothing selected. */
-
-    save_as_dialog = new FileChooserDialog (_("Save File"),
-                                            this,
-                                            Gtk.FileChooserAction.SAVE,
-                                            _("_Cancel"), Gtk.ResponseType.CANCEL,
-                                            _("Save"), Gtk.ResponseType.ACCEPT,
-                                            null);
-
-    save_as_dialog.do_overwrite_confirmation = true;
-    basename                                 = GLib.Filename.display_basename (filename);
-    save_as_dialog.set_current_name (basename);
-    save_as_dialog.set_current_folder (GLib.Environment.get_home_dir ());
-
-    response = save_as_dialog.run ();
-
-    save_as_dialog.hide ();
-    if (response == Gtk.ResponseType.ACCEPT)
-    {
-      string target_filename;
-      target_filename = save_as_dialog.get_filename ();
-
-      File src  = File.new_for_path (filename);
-      File dest = File.new_for_path (target_filename);
-
-      try
-      {
-        src.copy (dest, FileCopyFlags.OVERWRITE, null, null);
-      }
-      catch (Error err)
-      {
-        MessageDialog error_dialog = new MessageDialog (this,
-                                                        Gtk.DialogFlags.MODAL |
-                                                        Gtk.DialogFlags.DESTROY_WITH_PARENT,
-                                                        Gtk.MessageType.ERROR,
-                                                        Gtk.ButtonsType.OK,
-                                                        _("Could not save %s"),
-                                                        target_filename);
-
-        error_dialog.run ();
-        error_dialog.destroy ();
-      }
-    }
-    save_as_dialog.destroy ();
-  }
-
-    /**
-     * Toggle fullscreen mode.
-     *
-     * @param fullscreen whether the window should be fullscreen
-     */
-    public void set_fullscreen (bool fullscreen)
-    {
-        set_fullscreen_mode (fullscreen);
-    }
-
-    /**
-     * Make the media capture mode actions sensitive.
-     */
-    private void enable_mode_change ()
-    {
-        var mode = this.application.lookup_action ("mode") as SimpleAction;
-        mode.set_enabled (true);
-        var effects = this.application.lookup_action ("effects") as SimpleAction;
-        effects.set_enabled (true);
-        var preferences = this.application.lookup_action ("preferences") as SimpleAction;
-        preferences.set_enabled (true);
-    }
-
-    /**
-     * Make the media capture mode actions insensitive.
-     */
-    private void disable_mode_change ()
-    {
-        var mode = this.application.lookup_action ("mode") as SimpleAction;
-        mode.set_enabled (false);
-        var effects = this.application.lookup_action ("effects") as SimpleAction;
-        effects.set_enabled (false);
-        var preferences = this.application.lookup_action ("preferences") as SimpleAction;
-        preferences.set_enabled (false);
-    }
-
-  /**
-   * Set the capture resolution, based on the current capture mode.
-   *
-   * @param mode the current capture mode (photo, video or burst)
-   */
-  private void set_resolution(MediaMode mode)
-  {
-    if (camera == null)
-      return;
-
-    var formats = camera.get_video_formats ();
-
-    if (formats == null)
-      return;
-    
-    unowned Cheese.VideoFormat format;
-    int width = 0;
-    int height = 0;
-
-    switch (mode)
-    {
-      case MediaMode.PHOTO:
-      case MediaMode.BURST:
-        width  = settings.get_int ("photo-x-resolution");
-        height = settings.get_int ("photo-y-resolution");
-        break;
-      case MediaMode.VIDEO:
-        width  = settings.get_int ("video-x-resolution");
-        height = settings.get_int ("video-y-resolution");
-        break;
-    }
-
-    for (int i = 0; i < formats.length (); i++)
-    {
-      format = formats<VideoFormat>.nth (i).data;
-      if (width == format.width && height == format.height)
-      {
-        camera.set_video_format (format);
-        break;
-      }
-    }
-  }
-
-  private TimeoutSource fullscreen_timeout;
-  /**
-   * Clear the fullscreen activity timeout.
-   */
-  private void clear_fullscreen_timeout ()
-  {
-    if (fullscreen_timeout != null)
-    {
-      fullscreen_timeout.destroy ();
-      fullscreen_timeout = null;
-    }
-  }
-
-  /**
-   * Set the fullscreen timeout, for hiding the UI if there is no mouse
-   * movement.
-   */
-  private void set_fullscreen_timeout ()
-  {
-    fullscreen_timeout = new TimeoutSource (FULLSCREEN_TIMEOUT_INTERVAL);
-    fullscreen_timeout.attach (null);
-    fullscreen_timeout.set_callback (() => {buttons_area.hide ();
-                                            clear_fullscreen_timeout ();
-                                            this.fullscreen ();
-                                            return true; });
-  }
-
-    /**
-     * Show the UI in fullscreen if there is any mouse activity.
-     *
-     * Start a new timeout at the end of every mouse pointer movement. All
-     * timeouts will be cancelled, except one created during the last movement
-     * event. Show() is called even if the button is not hidden.
-     *
-     * @param viewport the widget to check for mouse activity on
-     * @param e the (unused) event
-     */
-    private bool fullscreen_motion_notify_callback (Gtk.Widget viewport,
-                                                    EventMotion e)
-    {
-        clear_fullscreen_timeout ();
-        this.unfullscreen ();
-        this.maximize ();
-        buttons_area.show ();
-        set_fullscreen_timeout ();
-        return true;
-    }
-
-  /**
-   * Enable or disable fullscreen mode to the requested state.
-   *
-   * @param fullscreen_mode whether to enable or disable fullscreen mode
-   */
-  private void set_fullscreen_mode (bool fullscreen)
-  {
-    /* After the first time the window has been shown using this.show_all (),
-     * the value of leave_fullscreen_button_box.no_show_all should be set to false
-     * So that the next time leave_fullscreen_button_box.show_all () is called, the button is actually shown
-     * FIXME: If this code can be made cleaner/clearer, please do */
-
-    is_fullscreen = fullscreen;
-    if (fullscreen)
-    {
-            window_state_event.connect (on_window_state_change_event);
-
-      if (is_wide_mode)
-      {
-        thumbnails_right.hide ();
-      }
-      else
-      {
-        thumbnails_bottom.hide ();
-      }
-      leave_fullscreen_button_box.no_show_all = false;
-      leave_fullscreen_button_box.show_all ();
-
-      this.fullscreen ();
-      viewport_widget.motion_notify_event.connect (fullscreen_motion_notify_callback);
-      set_fullscreen_timeout ();
-    }
-    else
-    {
-      if (is_wide_mode)
-      {
-        thumbnails_right.show_all ();
-      }
-      else
-      {
-        thumbnails_bottom.show_all ();
-      }
-      leave_fullscreen_button_box.hide ();
-
-      /* Stop timer so buttons_area does not get hidden after returning from
-       * fullscreen mode */
-      clear_fullscreen_timeout ();
-      /* Show the buttons area anyway - it might've been hidden in fullscreen mode */
-      buttons_area.show ();
-      viewport_widget.motion_notify_event.disconnect (fullscreen_motion_notify_callback);
-      this.unfullscreen ();
-
-            if (was_maximized)
-            {
-                this.maximize ();
-            }
-            else
-            {
-                this.unmaximize ();
-            }
-    }
-  }
-
-  /**
-   * Enable or disable wide mode to the requested state.
-   *
-   * @param wide_mode whether to enable or disable wide mode
-   */
-  public void set_wide_mode (bool wide_mode)
-  {
-    is_wide_mode = wide_mode;
-
-    /* keep the viewport to its current size while rearranging the ui,
-     * so that thumbview moves from right to bottom and viceversa
-     * while the rest of the window stays unchanged */
-    Gtk.Allocation alloc;
-    viewport_widget.get_allocation (out alloc);
-    viewport_widget.set_size_request (alloc.width, alloc.height);
-
-    if (is_wide_mode)
-    {
-      thumb_view.set_vertical (true);
-      thumb_nav.set_vertical (true);
-      if (thumbnails_bottom.get_child () != null)
-      {
-        thumbnails_bottom.remove (thumb_nav);
-      }
-      thumbnails_right.add (thumb_nav);
-
-            if (!is_fullscreen)
-            {
-                thumbnails_right.show_all ();
-                thumbnails_bottom.hide ();
-            }
-    }
-    else
-    {
-      thumb_view.set_vertical (false);
-      thumb_nav.set_vertical (false);
-      if (thumbnails_right.get_child () != null)
-      {
-        thumbnails_right.remove (thumb_nav);
-      }
-      thumbnails_bottom.add (thumb_nav);
-
-            if (!is_fullscreen)
-            {
-                thumbnails_bottom.show_all ();
-                thumbnails_right.hide ();
-            }
-    }
-
-    /* handy trick to keep the window to the desired size while not
-     * requesting a fixed one. This way the window is resized to its
-     * natural size (particularly with the constraints imposed by the
-     * viewport, see above) but can still be shrinked down */
-
-    Gtk.Requisition req;
-    this.get_preferred_size(out req, out req);
-    this.resize (req.width, req.height);
-    viewport_widget.set_size_request (-1, -1);
-  }
-
-  /**
-   * Make sure that the layout manager manages the entire stage.
-   *
-   * @param actor unused
-   * @param box unused
-   * @param flags unused
-   */
-  public void on_stage_resize (Clutter.Actor           actor,
-                               Clutter.ActorBox        box,
-                               Clutter.AllocationFlags flags)
-  {
-    this.viewport_layout.set_size (viewport.width, viewport.height);
-    this.background_layer.set_size (viewport.width, viewport.height);
-    this.timeout_layer.set_position (video_preview.width/3 + viewport.width/2,
-                                viewport.height-20);
-  }
-
-  /**
-   * The method to call when the countdown is finished.
-   */
-  private void finish_countdown_callback ()
-  {
-    if (action_cancelled == false)
-    {
-      string file_name = fileutil.get_new_media_filename (this.current_mode);
-
-      if (settings.get_boolean ("flash"))
-      {
-        this.flash.fire ();
-      }
-      CanberraGtk.play_for_widget (this.main_vbox, 0,
-                                   Canberra.PROP_EVENT_ID, "camera-shutter",
-                                   Canberra.PROP_MEDIA_ROLE, "event",
-                                   Canberra.PROP_EVENT_DESCRIPTION, _("Shutter sound"),
-                                   null);
-      this.camera.take_photo (file_name);
-    }
-
-    if (current_mode == MediaMode.PHOTO)
-    {
-      enable_mode_change ();
-    }
-  }
-
-  Countdown current_countdown;
-  /**
-   * Start to take a photo, starting a countdown if it is enabled.
-   */
-  public void take_photo ()
-  {
-    if (settings.get_boolean ("countdown"))
-    {
-      if (current_mode == MediaMode.PHOTO)
-      {
-        disable_mode_change ();
-      }
-
-      current_countdown = new Countdown (this.countdown_layer);
-      current_countdown.start (finish_countdown_callback);
-    }
-    else
-    {
-      finish_countdown_callback ();
-    }
-  }
-
-  private int  burst_count;
-  private uint burst_callback_id;
-
-  /**
-   * Take a photo during burst mode, and increment the burst count.
-   *
-   * @return true if there are more photos to be taken in the current burst,
-   * false otherwise
-   */
-  private bool burst_take_photo ()
-  {
-    if (is_bursting && burst_count < settings.get_int ("burst-repeat"))
-    {
-      this.take_photo ();
-      burst_count++;
-      return true;
-    }
-    else
-    {
-      toggle_photo_bursting (false);
-      return false;
-    }
-  }
-
-  /**
-   * Cancel the current activity if the escape key is pressed.
-   *
-   * @param event the key event, to check which key was pressed
-   * @return false, to allow further processing of the event
-   */
-  private bool on_key_release (Gdk.EventKey event)
-  {
-    string key;
-
-    key = Gdk.keyval_name (event.keyval);
-    if (strcmp (key, "Escape") == 0)
-    {
-      if ((current_countdown != null && current_countdown.running) || is_bursting || is_recording)
-      {
-        action_cancelled = true;
-        switch (current_mode)
-        {
-          case MediaMode.PHOTO:
-           current_countdown.stop ();
-           finish_countdown_callback ();
-           break;
-          case MediaMode.BURST:
-            toggle_photo_bursting (false);
-            break;
-          case MediaMode.VIDEO:
-            toggle_video_recording (false);
-            break;
-        }
-        action_cancelled = false;
-      }
-      else if (is_effects_selector_active)
-      {
-        effects_toggle_button.set_active (false);
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Toggle whether video recording is active.
-   *
-   * @param is_start whether to start video recording
-   */
-  public void toggle_video_recording (bool is_start)
-  {
-    if (is_start)
-    {
-      camera.start_video_recording (fileutil.get_new_media_filename (this.current_mode));
-      /* Will be called every 1 second while
-       * update_timeout_layer returns true.
-       */
-      Timeout.add_seconds (1, update_timeout_layer);
-      take_action_button.tooltip_text = _("Stop recording");
-      take_action_button_image.set_from_icon_name ("media-playback-stop-symbolic", Gtk.IconSize.BUTTON);
-      this.is_recording = true;
-      this.disable_mode_change ();
-    }
-    else
-    {
-      camera.stop_video_recording ();
-      /* The timeout_layer always shows the "00:00:00"
-       * string when not recording, in order to notify
-       * the user about two things:
-       *   + The user is making use of the recording mode.
-       *   + The user is currently not recording.
-       */
-      timeout_layer.text = "00:00:00";
-      take_action_button.tooltip_text = _("Record a video");
-      take_action_button_image.set_from_icon_name ("camera-web-symbolic", Gtk.IconSize.BUTTON);
-      this.is_recording = false;
-      this.enable_mode_change ();
-    }
-  }
-
-  /**
-   * Update the timeout layer displayed timer.
-   *
-   * @return false, if the source, Timeout.add_seconds (used
-   * in the toogle_video_recording method), should be removed.
-   */
-  private bool update_timeout_layer ()
-  {
-    if (is_recording) {
-      timeout_layer.text = camera.get_recorded_time ();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  /**
-   * Toggle whether photo bursting is active.
-   *
-   * @param is_start whether to start capturing a photo burst
-   */
-  public void toggle_photo_bursting (bool is_start)
-  {
-    if (is_start)
-    {
-      is_bursting = true;
-      this.disable_mode_change ();
-      // FIXME: Set the effects action to be inactive.
-      take_action_button.tooltip_text = _("Stop taking pictures");
-      burst_take_photo ();
-
-      /* Use the countdown duration if it is greater than the burst delay, plus
-       * about 500 ms for taking the photo. */
-      var burst_delay = settings.get_int ("burst-delay");
-      var countdown_duration = 500 + settings.get_int ("countdown-duration") * 1000;
-      if ((burst_delay - countdown_duration) < 1000 && settings.get_boolean ("countdown"))
-      {
-        burst_callback_id = GLib.Timeout.add (countdown_duration, burst_take_photo);
-      }
-      else
-      {
-        burst_callback_id = GLib.Timeout.add (burst_delay, burst_take_photo);
-      }
-    }
-    else
-    {
-      if (current_countdown != null && current_countdown.running)
-        current_countdown.stop ();
-
-      is_bursting = false;
-      this.enable_mode_change ();
-      take_action_button.tooltip_text = _("Take multiple photos");
-      burst_count = 0;
-      fileutil.reset_burst ();
-      GLib.Source.remove (burst_callback_id);
-    }
-  }
-
-    /**
-     * Take a photo or burst of photos, or record a video, based on the current
-     * capture mode.
-     */
-    public void shoot ()
-    {
-        switch (current_mode)
-        {
-            case MediaMode.PHOTO:
-                take_photo ();
-                break;
-            case MediaMode.VIDEO:
-                toggle_video_recording (!is_recording);
-                break;
-            case MediaMode.BURST:
-                toggle_photo_bursting (!is_bursting);
-                break;
-            default:
-                assert_not_reached ();
-        }
-    }
-
-    /**
-     * Show an error.
-     *
-     * @param error the error to display, or null to hide the error layer
-     */
-    public void show_error (string? error)
-    {
-        if (error != null)
-        {
-            current_effects_grid.hide ();
-            video_preview.hide ();
-            error_layer.text = error;
-            error_layer.show ();
-        }
-        else
-        {
-            error_layer.hide ();
-
-            if (is_effects_selector_active)
-            {
-                current_effects_grid.show ();
-            }
-            else
-            {
-                video_preview.show ();
-            }
-        }
-    }
-
-    /**
-     * Toggle the display of the effect selector.
-     *
-     * @param effects whether effects should be enabled
-     */
-    public void set_effects (bool effects)
-    {
-        toggle_effects_selector (effects);
-    }
-
-  /**
-   * Change the selected effect, as a new one was selected.
-   *
-   * @param tap unused
-   * @param source the actor (with associated effect) that was selected
-   */
-  public void on_selected_effect_change (Clutter.TapAction tap,
-                                         Clutter.Actor source)
-  {
-    /* Disable the effects selector after selecting an effect. */
-    effects_toggle_button.set_active (false);
-
-    selected_effect = source.get_data ("effect");
-    camera.set_effect (selected_effect);
-    settings.set_string ("selected-effect", selected_effect.name);
-  }
-
-    /**
-     * Navigate back one page of effects.
-     */
-    private void on_effects_previous ()
-    {
-        if (is_previous_effects_page ())
-        {
-            activate_effects_page ((int)current_effects_page - 1);
-        }
-    }
-
-    /**
-     * Navigate forward one page of effects.
-     */
-    private void on_effects_next ()
-    {
-        if (is_next_effects_page ())
-        {
-            activate_effects_page ((int)current_effects_page + 1);
-        }
-    }
-
-  /**
-   * Switch to the supplied page of effects.
-   *
-   * @param number the effects page to switch to
-   */
-  private void activate_effects_page (int number)
-  {
-    if (!is_effects_selector_active)
-      return;
-    current_effects_page = number;
-    if (viewport_layout.get_children ().index (current_effects_grid) != -1)
-    {
-      viewport_layout.remove_child (current_effects_grid);
-    }
-    current_effects_grid = effects_grids.nth_data (number);
-    current_effects_grid.opacity = 0;
-    viewport_layout.add_child (current_effects_grid);
-    current_effects_grid.save_easing_state ();
-    current_effects_grid.set_easing_mode (Clutter.AnimationMode.LINEAR);
-    current_effects_grid.set_easing_duration (500);
-    current_effects_grid.opacity = 255;
-    current_effects_grid.restore_easing_state ();
-
-
-    uint i = 0;
-    foreach (var effect in effects_manager.effects)
-    {
-        uint page_nr = i / EFFECTS_PER_PAGE;
-        if (page_nr == number)
-        {
-            if (!effect.is_preview_connected ())
-            {
-                Clutter.Texture texture = effect.get_data<Clutter.Texture> ("texture");
-                camera.connect_effect_texture (effect, texture);
-            }
-            effect.enable_preview ();
-        }
-        else
-        {
-            if (effect.is_preview_connected ())
-            {
-                effect.disable_preview ();
-            }
-        }
-
-	    i++;
-    }
-
-    setup_effects_page_switch_sensitivity ();
-  }
-
-    /**
-     * Control the sensitivity of the effects page navigation buttons.
-     */
-    private void setup_effects_page_switch_sensitivity ()
-    {
-        var effects_next = this.lookup_action ("effects-next") as SimpleAction;
-        var effects_previous = this.lookup_action ("effects-previous") as SimpleAction;
-
-        effects_next.set_enabled (is_effects_selector_active
-                                  && is_next_effects_page ());
-        effects_previous.set_enabled (is_effects_selector_active
-                                      && is_previous_effects_page ());
-    }
-
-    private bool is_next_effects_page ()
-    {
-        // Calculate the number of effects visible up to the current page.
-        return (current_effects_page + 1) * EFFECTS_PER_PAGE < effects_manager.effects.length ();
-    }
-
-    private bool is_previous_effects_page ()
-    {
-        return current_effects_page != 0;
-    }
-
-    /**
-     * Toggle the visibility of the effects selector.
-     *
-     * @param active whether the selector should be active
-     */
-    private void toggle_effects_selector (bool active)
-    {
-        is_effects_selector_active = active;
-
-        if (effects_grids.length () == 0)
-        {
-            show_error (active ? _("No effects found") : null);
-        }
-        else if (active)
-        {
-            video_preview.hide ();
-            current_effects_grid.show ();
-            activate_effects_page ((int)current_effects_page);
-        }
-        else
-        {
-            current_effects_grid.hide ();
-            video_preview.show ();
-        }
-
-        camera.toggle_effects_pipeline (active);
-        setup_effects_page_switch_sensitivity ();
-        update_header_bar_title ();
-    }
-
-  /**
-   * Create the effects selector.
-   */
-  private void setup_effects_selector ()
-  {
-    if (current_effects_grid == null)
-    {
-      effects_manager = new EffectsManager ();
-      effects_manager.load_effects ();
-
-      /* Must initialize effects_grids before returning, as it is dereferenced later, bug 654671. */
-      effects_grids = new List<Clutter.Actor> ();
-
-      if (effects_manager.effects.length () == 0)
-      {
-        warning ("gnome-video-effects is not installed.");
-        return;
-      }
-
-      foreach (var effect in effects_manager.effects)
-      {
-          Clutter.GridLayout grid_layout = new GridLayout ();
-          var grid = new Clutter.Actor ();
-          grid.set_layout_manager (grid_layout);
-          effects_grids.append (grid);
-          grid_layout.set_column_spacing (10);
-          grid_layout.set_row_spacing (10);
-      }
-
-      uint i = 0;
-      foreach (var effect in effects_manager.effects)
-      {
-        Clutter.Texture   texture = new Clutter.Texture ();
-        Clutter.BinLayout layout  = new Clutter.BinLayout (Clutter.BinAlignment.CENTER,
-                                                           Clutter.BinAlignment.CENTER);
-        var box = new Clutter.Actor ();
-        box.set_layout_manager (layout);
-        Clutter.Text      text = new Clutter.Text ();
-        var rect = new Clutter.Actor ();
-
-        rect.opacity = 128;
-        rect.background_color = Clutter.Color.from_string ("black");
-
-        texture.keep_aspect_ratio = true;
-        box.add_child (texture);
-        box.reactive = true;
-        var tap = new Clutter.TapAction ();
-        box.add_action (tap);
-        tap.tap.connect (on_selected_effect_change);
-        box.set_data ("effect", effect);
-        effect.set_data ("texture", texture);
-
-        text.text  = effect.name;
-        text.color = Clutter.Color.from_string ("white");
-
-        rect.height = text.height + 5;
-        rect.x_align = Clutter.ActorAlign.FILL;
-        rect.y_align = Clutter.ActorAlign.END;
-        rect.x_expand = true;
-        rect.y_expand = true;
-        box.add_child (rect);
-
-        text.x_align = Clutter.ActorAlign.CENTER;
-        text.y_align = Clutter.ActorAlign.END;
-        text.x_expand = true;
-        text.y_expand = true;
-        box.add_child (text);
-
-        var grid_layout = effects_grids.nth_data (i / EFFECTS_PER_PAGE).layout_manager as GridLayout;
-        grid_layout.attach (box, ((int)(i % EFFECTS_PER_PAGE)) % 3,
-                            ((int)(i % EFFECTS_PER_PAGE)) / 3, 1, 1);
-
-        i++;
-      }
-
-      setup_effects_page_switch_sensitivity ();
-      current_effects_grid = effects_grids.nth_data (0);
-    }
-  }
-
-    /**
-     * Update the UI when the camera starts playing.
-     */
-    public void camera_state_change_playing ()
-    {
-        show_error (null);
-
-        Effect effect = effects_manager.get_effect (settings.get_string ("selected-effect"));
-        if (effect != null)
-        {
-            camera.set_effect (effect);
-        }
-    }
-
-    /**
-     * Report an error as the camerabin switched to the NULL state.
-     */
-    public void camera_state_change_null ()
-    {
-        if (!error_layer.visible)
-        {
-            show_error (_("There was an error playing video from the webcam"));
-        }
-    }
-
-  /**
-   * Load the UI from the GtkBuilder description.
-   */
-  public void setup_ui ()
-  {
-        clutter_builder = new Clutter.Script ();
-    fileutil        = new FileUtil ();
-    flash           = new Flash (this);
-    settings        = new GLib.Settings ("org.gnome.Cheese");
-
-        var menu = new GLib.Menu ();
-        var section = new GLib.Menu ();
-        menu.append_section (null, section);
-        var item = new GLib.MenuItem (_("Open"), "win.file-open");
-        item.set_attribute ("accel", "s", "<Primary>o");
-        section.append_item (item);
-        item = new GLib.MenuItem (_("Save _As…"), "win.file-saveas");
-        item.set_attribute ("accel", "s", "<Primary>S");
-        section.append_item (item);
-        item = new GLib.MenuItem (_("Move to _Trash"), "win.file-trash");
-        item.set_attribute ("accel", "s", "Delete");
-        section.append_item (item);
-        item = new GLib.MenuItem (_("Delete"), "win.file-delete");
-        item.set_attribute ("accel", "s", "<Shift>Delete");
-        section.append_item (item);
-        thumbnail_popup = new Gtk.Menu.from_model (menu);
-
-        this.add_action_entries (actions, this);
-
-        try
-        {
-            clutter_builder.load_from_resource ("/org/gnome/Cheese/cheese-viewport.json");
-        }
-        catch (Error err)
-        {
-            error ("Error: %s", err.message);
-        }
-
-        viewport = viewport_widget.get_stage () as Clutter.Stage;
-
-        video_preview = clutter_builder.get_object ("video_preview") as Clutter.Texture;
-        viewport_layout = clutter_builder.get_object ("viewport_layout") as Clutter.Actor;
-        viewport_layout_manager = clutter_builder.get_object ("viewport_layout_manager") as Clutter.BinLayout;
-        countdown_layer = clutter_builder.get_object ("countdown_layer") as Clutter.Text;
-        background_layer = clutter_builder.get_object ("background") as Clutter.Actor;
-        error_layer = clutter_builder.get_object ("error_layer") as Clutter.Text;
-        timeout_layer = clutter_builder.get_object ("timeout_layer") as Clutter.Text;
-
-    video_preview.keep_aspect_ratio = true;
-    video_preview.request_mode      = Clutter.RequestMode.HEIGHT_FOR_WIDTH;
-    viewport.add_child (background_layer);
-    viewport_layout.set_layout_manager (viewport_layout_manager);
-
-    viewport.add_child (viewport_layout);
-    viewport.add_child (timeout_layer);
-
-    viewport.allocation_changed.connect (on_stage_resize);
-
-    thumb_view = new Cheese.ThumbView ();
-    thumb_nav  = new Eog.ThumbNav (thumb_view, false);
-        thumbnail_popup.attach_to_widget (thumb_view, null);
-
-        Gtk.CssProvider css;
-        try
-        {
-            var file = File.new_for_uri ("resource:///org/gnome/Cheese/cheese.css");
-            css = new Gtk.CssProvider ();
-            css.load_from_file (file);
-        }
-        catch (Error e)
-        {
-            // TODO: Use parsing-error signal.
-            error ("Error parsing CSS: %s\n", e.message);
-        }
-
-    Gtk.StyleContext.add_provider_for_screen (screen, css, STYLE_PROVIDER_PRIORITY_USER);
-
-    thumb_view.button_press_event.connect (on_thumbnail_button_press_event);
-
-    /* needed for the sizing tricks in set_wide_mode (allocation is 0
-     * if the widget is not realized */
-    viewport_widget.realize ();
-
-    set_wide_mode (false);
-
-    setup_effects_selector ();
-
-    this.key_release_event.connect (on_key_release);
-  }
-
-    public Clutter.Texture get_video_preview ()
-    {
-        return video_preview;
-    }
-
-  /**
-   * Setup the thumbview thumbnail monitors.
-   */
-  public void start_thumbview_monitors ()
-  {
-    thumb_view.start_monitoring_video_path (fileutil.get_video_path ());
-    thumb_view.start_monitoring_photo_path (fileutil.get_photo_path ());
-  }
-
-    /**
-     * Set the current media mode (photo, video or burst).
-     *
-     * @param mode the media mode to set
-     */
-    public void set_current_mode (MediaMode mode)
-    {
-        current_mode = mode;
-
-        set_resolution (current_mode);
-        update_header_bar_title ();
-        timeout_layer.hide ();
-
-        switch (current_mode)
-        {
-            case MediaMode.PHOTO:
-                take_action_button.tooltip_text = _("Take a photo using a webcam");
-                break;
-
-            case MediaMode.VIDEO:
-                take_action_button.tooltip_text = _("Record a video using a webcam");
-                timeout_layer.text = "00:00:00";
-                timeout_layer.show ();
-                break;
-
-            case MediaMode.BURST:
-                take_action_button.tooltip_text = _("Take multiple photos using a webcam");
-                break;
-        }
-    }
-
-     /**
-     * Set the header bar title.
-     */
-    private void update_header_bar_title ()
-    {
-        if (is_effects_selector_active)
-        {
-            header_bar.set_title (_("Choose an Effect"));
-        }
-        else
-        {
-            switch (current_mode)
-            {
-                case MediaMode.PHOTO:
-                    header_bar.set_title (_("Take a Photo"));
-                    break;
-
-                case MediaMode.VIDEO:
-                    header_bar.set_title (_("Record a Video"));
-                    break;
-
-                case MediaMode.BURST:
-                    header_bar.set_title (_("Take Multiple Photos"));
-                    break;
-            }
-        }
-    }
-    /**
-     * Set the camera.
-     *
-     * @param camera the camera to set
-     */
-    public void set_camera (Camera camera)
-    {
-        this.camera = camera;
-    }
-}

=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2014-06-11 21:45:53 +0000
@@ -0,0 +1,1 @@
+use-plugins-good

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2014-05-23 11:12:02 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-use-plugins-good
-0001-Use-avatar-chooser-headerbar-only-when-requested.patch
-0002-Use-a-traditional-title-bar-when-requested.patch

=== added directory '.pc/use-plugins-good'
=== removed directory '.pc/use-plugins-good'
=== added file '.pc/use-plugins-good/.timestamp'
=== added file '.pc/use-plugins-good/configure.ac'
--- .pc/use-plugins-good/configure.ac	1970-01-01 00:00:00 +0000
+++ .pc/use-plugins-good/configure.ac	2014-06-11 21:45:53 +0000
@@ -0,0 +1,226 @@
+# Process this file with autoconf to produce a configure script.
+AC_PREREQ([2.64])
+AC_INIT([Cheese],
+        [3.12.2],
+        [https://bugzilla.gnome.org/enter_bug.cgi?product=cheese],
+        [cheese],
+        [https://wiki.gnome.org/Apps/Cheese])
+
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_HEADERS([cheese-config.h])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability dist-xz no-define no-dist-gzip nostdinc subdir-objects])
+AM_MAINTAINER_MODE([enable])
+AM_SILENT_RULES([yes])
+
+# Check for programs
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_VALAC([0.23.3])
+
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT([disable-static])
+
+PKG_PROG_PKG_CONFIG([0.24])
+
+AC_SUBST([CHEESE_WFLAGS], ["-Wall -DGSEAL_ENABLE"])
+
+GNOME_MAINTAINER_MODE_DEFINES
+GNOME_COMPILE_WARNINGS([maximum])
+
+#*******************************************************************************
+# Libraries
+#*******************************************************************************
+# Before making a release, the CHEESE_LT_VERSION string should be modified.
+# The string is of the form C:R:A.
+# - If interfaces have been changed or added, but binary compatibility has
+#   been preserved, change to C+1:0:A+1
+# - 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], [7:25:0])
+AC_SUBST([LIBCHEESE_GTK_LT_VERSION], [24:9:1])
+
+#*******************************************************************************
+# Internationalization
+#*******************************************************************************
+AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [GETTEXT package name])
+IT_PROG_INTLTOOL([0.50.0])
+
+#*******************************************************************************
+# Check required libraries
+#*******************************************************************************
+
+
+GLIB_REQUIRED="glib-2.0 >= 2.39.90"
+GTK_REQUIRED="gtk+-3.0 >= 3.10.0"
+GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0"
+LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0 >= 2.91.6"
+GSTREAMER_VERSION=0.11.0
+GSTREAMER_REQUIRED="gstreamer-plugins-base-1.0 >= $GSTREAMER_VERSION gstreamer-1.0 >= $GSTREAMER_VERSION gstreamer-pbutils-1.0 >= $GSTREAMER_VERSION"
+GSTREAMER_PLUGINS_BAD_VERSION=0.11.0
+GSTREAMER_PLUGINS_BAD_REQUIRED="gstreamer-plugins-bad-1.0 >= $GSTREAMER_PLUGINS_BAD_VERSION"
+CAIRO_REQUIRED="cairo >= 1.10.0"
+PANGOCAIRO_REQUIRED="pangocairo >= 1.28.0"
+LIBRSVG_REQUIRED="librsvg-2.0 >= 2.32.0"
+CLUTTER_REQUIRED="clutter-1.0 >= 1.13.2"
+CLUTTERGTK_REQUIRED="clutter-gtk-1.0 >= 0.91.8"
+CLUTTERGST_REQUIRED="clutter-gst-2.0 >= 1.9.0"
+LIBCANBERRA_REQUIRED="libcanberra-gtk3 >= 0.26"
+X11_REQUIRED="x11"
+GNOME_VIDEO_EFFECTS_REQUIRED="gnome-video-effects"
+
+# Libtool requires this, but it is only expanded once anyway.
+AC_CANONICAL_HOST
+
+AC_MSG_CHECKING([host operating system])
+AS_CASE([$host_os],
+  [*linux-*], [AC_MSG_RESULT([Linux])
+    UDEV_REQUIRED="gudev-1.0"],
+  [AC_MSG_RESULT([unsupported operating system])])
+
+AC_MSG_CHECKING([for gudev-1.0])
+AS_IF([test -n "$UDEV_REQUIRED"],
+  [PKG_CHECK_EXISTS([$UDEV_REQUIRED],
+    [AC_MSG_RESULT([found])
+     AC_DEFINE([HAVE_UDEV], [], [Enable gudev support])],
+    [AC_MSG_ERROR([$UDEV_REQUIRED not found])])],
+  [AC_MSG_RESULT([not needed])])
+
+AC_CHECK_HEADERS([sys/videoio.h])
+
+AC_CHECK_HEADER([X11/extensions/XTest.h],
+  [AC_CHECK_LIB([Xtst], [XTestFakeKeyEvent],
+    [AC_SUBST([XTEST_LIBS], ["-lX11 -lXtst"])])])
+AM_CONDITIONAL([HAVE_XTEST], test "x$ac_cv_lib_Xtst_XTestFakeKeyEvent" = "xyes")
+
+PKG_CHECK_MODULES([CHEESE],
+  [$GLIB_REQUIRED
+  $X11_REQUIRED
+  $GDK_PIXBUF_REQUIRED
+  $GSTREAMER_REQUIRED
+  $GSTREAMER_PLUGINS_BAD_REQUIRED
+  $LIBGNOMEDESKTOP_REQUIRED
+  $CAIRO_REQUIRED
+  $PANGOCAIRO_REQUIRED
+  $CLUTTER_REQUIRED
+  $CLUTTERGST_REQUIRED
+  $UDEV_REQUIRED])
+
+PKG_CHECK_MODULES([CHEESE_GTK],
+  [$GTK_REQUIRED
+   $LIBRSVG_REQUIRED
+   $CLUTTERGTK_REQUIRED
+   $LIBCANBERRA_REQUIRED
+   $UDEV_REQUIRED
+   $GNOME_VIDEO_EFFECTS_REQUIRED])
+
+# Resources.
+AC_SUBST([GLIB_COMPILE_RESOURCES], [`$PKG_CONFIG --variable glib_compile_resources gio-2.0`])
+
+# Recommend some runtime GStreamer plugins.
+AC_PATH_PROGS([GST_INSPECT], [gst-inspect-1.0], [notfound])
+AS_IF([test "x$GST_INSPECT" = "xnotfound"],
+  [AC_MSG_WARN([unable to check for runtime GStreamer plugin dependencies])],
+  [GST_RUNTIME_PLUGINS="camerabin vp8enc webmmux"
+   for gst_runtime_plugin in $GST_RUNTIME_PLUGINS
+   do
+     AC_MSG_CHECKING([for $gst_runtime_plugin GStreamer plugin])
+     AS_IF([$GST_INSPECT $gst_runtime_plugin >&AS_MESSAGE_LOG_FD],
+       [AC_MSG_RESULT([found])],
+       [AC_MSG_RESULT([not found])
+        AC_MSG_WARN([$gst_runtime_plugin was not found. It needs to be installed before Cheese is run])])
+   done])
+
+# Check for GLib testing utilities.
+AC_PATH_PROG([GTESTER], [gtester], [notfound])
+AC_PATH_PROG([GTESTER_REPORT], [gtester-report], [notfound])
+AS_IF([test "x$GTESTER" = "xnotfound" -o "x$GTESTER_REPORT" = "xnotfound"],
+  [AC_MSG_WARN([testing disabled as the required utilities were not found])],
+  [CHEESE_ENABLE_TESTS=true
+   AC_SUBST([GTESTER])
+   AC_SUBST([GTESTER_REPORT])])
+AM_CONDITIONAL([CHEESE_ENABLE_TESTS], [test "x$CHEESE_ENABLE_TESTS" = "xtrue"])
+
+# Check for lcov.
+AC_ARG_ENABLE([lcov],
+  [AS_HELP_STRING([--disable-lcov], [Disable lcov code coverage testing])])
+
+AS_IF([test "x$enable_lcov" != "xno"],
+  [AC_PATH_PROG([LCOV], [lcov], [notfound])
+   AC_PATH_PROG([LCOV_GENHTML], [genhtml], [notfound])
+   AS_IF([test "x$LCOV" = "xnotfound" -o "x$LCOV_GENHTML" = "xnotfound"],
+     [have_lcov=no],
+     [have_lcov=yes])],
+  [have_lcov=no])
+
+AS_IF([test "x$have_lcov" = "xyes"],
+  [AC_SUBST([LCOV])
+   AC_SUBST([LCOV_GENHTML])
+   CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
+   LDFLAGS="$LDFLAGS -lgcov"],
+  [AS_IF([test "x$enable_lcov" = "xyes"],
+     [AC_MSG_ERROR([lcov code coverage reporting requested but not found])])])
+
+AM_CONDITIONAL([CHEESE_ENABLE_LCOV], [test "x$have_lcov" = "xyes"])
+
+AC_MSG_CHECKING([for glib-mkenums script])
+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+AS_IF([test "x$GLIB_MKENUMS" = "x"],
+  [AC_MSG_ERROR([glib-mkenums not listed in glib-2.0 pkg-config file])],
+  [AC_SUBST([GLIB_MKENUMS])
+   AC_MSG_RESULT([$GLIB_MKENUMS])])
+
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
+# API documentation
+GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
+
+# Manpage, generated with gtk-doc and xsltproc from DocBook XML.
+AC_ARG_ENABLE([man],
+  [AS_HELP_STRING([--disable-man], [Disable building the man page])])
+
+AS_IF([test "x$enable_man" != "xno"],
+  [AC_CHECK_PROG([have_xsltproc], [xsltproc], [yes], [no])
+   JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.3//EN],
+     [DocBook XML DTD V4.3], [have_docbookdtd=yes], [have_docbookdtd=no])
+   JH_CHECK_XML_CATALOG(
+     [http://docbook.sourceforge.net/release/xsl/current/html/refentry.xsl],
+     [DocBook XSL Stylesheets], [have_docbookxsl=yes], [have_docbookxsl=no])
+   AS_IF([test "x$have_xsltproc" = "xyes" -a "x$have_docbookdtd" = "xyes" \
+     -a "x$have_docbookxsl" = "xyes"],
+     [have_manutils=yes],
+     [AS_IF([test "x$enable_man" = "xyes"],
+       [AC_MSG_ERROR(
+         [manpage generation requested but required utilities were not found])])
+      have_manutils=no])],
+  [have_manutils=no])
+
+AM_CONDITIONAL([ENABLE_MAN], [test "x$have_manutils" = "xyes"])
+
+# Mallard help
+YELP_HELP_INIT
+
+# AppData
+APPDATA_XML
+
+GLIB_GSETTINGS
+#*******************************************************************************
+
+AC_CONFIG_FILES([
+Makefile
+docs/reference/Makefile
+docs/reference/version.xml
+data/cheese.pc
+data/cheese-gtk.pc
+data/cheese.desktop.in
+help/Makefile
+po/Makefile.in
+])
+AC_OUTPUT
+
+#**************************************************************************

=== removed file '.pc/use-plugins-good/configure.ac'
--- .pc/use-plugins-good/configure.ac	2014-05-23 11:12:02 +0000
+++ .pc/use-plugins-good/configure.ac	1970-01-01 00:00:00 +0000
@@ -1,226 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.64])
-AC_INIT([Cheese],
-        [3.12.1],
-        [https://bugzilla.gnome.org/enter_bug.cgi?product=cheese],
-        [cheese],
-        [https://wiki.gnome.org/Apps/Cheese])
-
-AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_HEADERS([cheese-config.h])
-AC_CONFIG_SRCDIR([configure.ac])
-AC_CONFIG_MACRO_DIR([m4])
-
-AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability dist-xz no-define no-dist-gzip nostdinc subdir-objects])
-AM_MAINTAINER_MODE([enable])
-AM_SILENT_RULES([yes])
-
-# Check for programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_VALAC([0.23.3])
-
-# Initialize libtool
-LT_PREREQ([2.2])
-LT_INIT([disable-static])
-
-PKG_PROG_PKG_CONFIG([0.24])
-
-AC_SUBST([CHEESE_WFLAGS], ["-Wall -DGSEAL_ENABLE"])
-
-GNOME_MAINTAINER_MODE_DEFINES
-GNOME_COMPILE_WARNINGS([maximum])
-
-#*******************************************************************************
-# Libraries
-#*******************************************************************************
-# Before making a release, the CHEESE_LT_VERSION string should be modified.
-# The string is of the form C:R:A.
-# - If interfaces have been changed or added, but binary compatibility has
-#   been preserved, change to C+1:0:A+1
-# - 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], [7:24:0])
-AC_SUBST([LIBCHEESE_GTK_LT_VERSION], [24:8:1])
-
-#*******************************************************************************
-# Internationalization
-#*******************************************************************************
-AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [GETTEXT package name])
-IT_PROG_INTLTOOL([0.50.0])
-
-#*******************************************************************************
-# Check required libraries
-#*******************************************************************************
-
-
-GLIB_REQUIRED="glib-2.0 >= 2.39.90"
-GTK_REQUIRED="gtk+-3.0 >= 3.10.0"
-GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0"
-LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0 >= 2.91.6"
-GSTREAMER_VERSION=0.11.0
-GSTREAMER_REQUIRED="gstreamer-plugins-base-1.0 >= $GSTREAMER_VERSION gstreamer-1.0 >= $GSTREAMER_VERSION gstreamer-pbutils-1.0 >= $GSTREAMER_VERSION"
-GSTREAMER_PLUGINS_BAD_VERSION=0.11.0
-GSTREAMER_PLUGINS_BAD_REQUIRED="gstreamer-plugins-bad-1.0 >= $GSTREAMER_PLUGINS_BAD_VERSION"
-CAIRO_REQUIRED="cairo >= 1.10.0"
-PANGOCAIRO_REQUIRED="pangocairo >= 1.28.0"
-LIBRSVG_REQUIRED="librsvg-2.0 >= 2.32.0"
-CLUTTER_REQUIRED="clutter-1.0 >= 1.13.2"
-CLUTTERGTK_REQUIRED="clutter-gtk-1.0 >= 0.91.8"
-CLUTTERGST_REQUIRED="clutter-gst-2.0 >= 1.9.0"
-LIBCANBERRA_REQUIRED="libcanberra-gtk3 >= 0.26"
-X11_REQUIRED="x11"
-GNOME_VIDEO_EFFECTS_REQUIRED="gnome-video-effects"
-
-# Libtool requires this, but it is only expanded once anyway.
-AC_CANONICAL_HOST
-
-AC_MSG_CHECKING([host operating system])
-AS_CASE([$host_os],
-  [*linux-*], [AC_MSG_RESULT([Linux])
-    UDEV_REQUIRED="gudev-1.0"],
-  [AC_MSG_RESULT([unsupported operating system])])
-
-AC_MSG_CHECKING([for gudev-1.0])
-AS_IF([test -n "$UDEV_REQUIRED"],
-  [PKG_CHECK_EXISTS([$UDEV_REQUIRED],
-    [AC_MSG_RESULT([found])
-     AC_DEFINE([HAVE_UDEV], [], [Enable gudev support])],
-    [AC_MSG_ERROR([$UDEV_REQUIRED not found])])],
-  [AC_MSG_RESULT([not needed])])
-
-AC_CHECK_HEADERS([sys/videoio.h])
-
-AC_CHECK_HEADER([X11/extensions/XTest.h],
-  [AC_CHECK_LIB([Xtst], [XTestFakeKeyEvent],
-    [AC_SUBST([XTEST_LIBS], ["-lX11 -lXtst"])])])
-AM_CONDITIONAL([HAVE_XTEST], test "x$ac_cv_lib_Xtst_XTestFakeKeyEvent" = "xyes")
-
-PKG_CHECK_MODULES([CHEESE],
-  [$GLIB_REQUIRED
-  $X11_REQUIRED
-  $GDK_PIXBUF_REQUIRED
-  $GSTREAMER_REQUIRED
-  $GSTREAMER_PLUGINS_BAD_REQUIRED
-  $LIBGNOMEDESKTOP_REQUIRED
-  $CAIRO_REQUIRED
-  $PANGOCAIRO_REQUIRED
-  $CLUTTER_REQUIRED
-  $CLUTTERGST_REQUIRED
-  $UDEV_REQUIRED])
-
-PKG_CHECK_MODULES([CHEESE_GTK],
-  [$GTK_REQUIRED
-   $LIBRSVG_REQUIRED
-   $CLUTTERGTK_REQUIRED
-   $LIBCANBERRA_REQUIRED
-   $UDEV_REQUIRED
-   $GNOME_VIDEO_EFFECTS_REQUIRED])
-
-# Resources.
-AC_SUBST([GLIB_COMPILE_RESOURCES], [`$PKG_CONFIG --variable glib_compile_resources gio-2.0`])
-
-# Recommend some runtime GStreamer plugins.
-AC_PATH_PROGS([GST_INSPECT], [gst-inspect-1.0], [notfound])
-AS_IF([test "x$GST_INSPECT" = "xnotfound"],
-  [AC_MSG_WARN([unable to check for runtime GStreamer plugin dependencies])],
-  [GST_RUNTIME_PLUGINS="camerabin vp8enc webmmux"
-   for gst_runtime_plugin in $GST_RUNTIME_PLUGINS
-   do
-     AC_MSG_CHECKING([for $gst_runtime_plugin GStreamer plugin])
-     AS_IF([$GST_INSPECT $gst_runtime_plugin >&AS_MESSAGE_LOG_FD],
-       [AC_MSG_RESULT([found])],
-       [AC_MSG_RESULT([not found])
-        AC_MSG_WARN([$gst_runtime_plugin was not found. It needs to be installed before Cheese is run])])
-   done])
-
-# Check for GLib testing utilities.
-AC_PATH_PROG([GTESTER], [gtester], [notfound])
-AC_PATH_PROG([GTESTER_REPORT], [gtester-report], [notfound])
-AS_IF([test "x$GTESTER" = "xnotfound" -o "x$GTESTER_REPORT" = "xnotfound"],
-  [AC_MSG_WARN([testing disabled as the required utilities were not found])],
-  [CHEESE_ENABLE_TESTS=true
-   AC_SUBST([GTESTER])
-   AC_SUBST([GTESTER_REPORT])])
-AM_CONDITIONAL([CHEESE_ENABLE_TESTS], [test "x$CHEESE_ENABLE_TESTS" = "xtrue"])
-
-# Check for lcov.
-AC_ARG_ENABLE([lcov],
-  [AS_HELP_STRING([--disable-lcov], [Disable lcov code coverage testing])])
-
-AS_IF([test "x$enable_lcov" != "xno"],
-  [AC_PATH_PROG([LCOV], [lcov], [notfound])
-   AC_PATH_PROG([LCOV_GENHTML], [genhtml], [notfound])
-   AS_IF([test "x$LCOV" = "xnotfound" -o "x$LCOV_GENHTML" = "xnotfound"],
-     [have_lcov=no],
-     [have_lcov=yes])],
-  [have_lcov=no])
-
-AS_IF([test "x$have_lcov" = "xyes"],
-  [AC_SUBST([LCOV])
-   AC_SUBST([LCOV_GENHTML])
-   CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
-   LDFLAGS="$LDFLAGS -lgcov"],
-  [AS_IF([test "x$enable_lcov" = "xyes"],
-     [AC_MSG_ERROR([lcov code coverage reporting requested but not found])])])
-
-AM_CONDITIONAL([CHEESE_ENABLE_LCOV], [test "x$have_lcov" = "xyes"])
-
-AC_MSG_CHECKING([for glib-mkenums script])
-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-AS_IF([test "x$GLIB_MKENUMS" = "x"],
-  [AC_MSG_ERROR([glib-mkenums not listed in glib-2.0 pkg-config file])],
-  [AC_SUBST([GLIB_MKENUMS])
-   AC_MSG_RESULT([$GLIB_MKENUMS])])
-
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
-
-# API documentation
-GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
-
-# Manpage, generated with gtk-doc and xsltproc from DocBook XML.
-AC_ARG_ENABLE([man],
-  [AS_HELP_STRING([--disable-man], [Disable building the man page])])
-
-AS_IF([test "x$enable_man" != "xno"],
-  [AC_CHECK_PROG([have_xsltproc], [xsltproc], [yes], [no])
-   JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.3//EN],
-     [DocBook XML DTD V4.3], [have_docbookdtd=yes], [have_docbookdtd=no])
-   JH_CHECK_XML_CATALOG(
-     [http://docbook.sourceforge.net/release/xsl/current/html/refentry.xsl],
-     [DocBook XSL Stylesheets], [have_docbookxsl=yes], [have_docbookxsl=no])
-   AS_IF([test "x$have_xsltproc" = "xyes" -a "x$have_docbookdtd" = "xyes" \
-     -a "x$have_docbookxsl" = "xyes"],
-     [have_manutils=yes],
-     [AS_IF([test "x$enable_man" = "xyes"],
-       [AC_MSG_ERROR(
-         [manpage generation requested but required utilities were not found])])
-      have_manutils=no])],
-  [have_manutils=no])
-
-AM_CONDITIONAL([ENABLE_MAN], [test "x$have_manutils" = "xyes"])
-
-# Mallard help
-YELP_HELP_INIT
-
-# AppData
-APPDATA_XML
-
-GLIB_GSETTINGS
-#*******************************************************************************
-
-AC_CONFIG_FILES([
-Makefile
-docs/reference/Makefile
-docs/reference/version.xml
-data/cheese.pc
-data/cheese-gtk.pc
-data/cheese.desktop.in
-help/Makefile
-po/Makefile.in
-])
-AC_OUTPUT
-
-#**************************************************************************

=== modified file 'ChangeLog'
--- ChangeLog	2014-05-23 11:12:02 +0000
+++ ChangeLog	2014-06-11 21:45:53 +0000
@@ -1,6 +1,96 @@
+commit fdb02a66fc5b131f0d5027d385e3d1bb9146e130
+Author: David King <[e-mail]>
+Date:   Mon May 12 21:05:24 2014 +0100
+
+    Update NEWS for 3.12.2 release
+
+M	NEWS
+M	configure.ac
+
+commit 682bf36c36feebabd4c8452b9731d42cf7930604
+Author: Carles Ferrando <[e-mail]>
+Date:	Fri May 9 01:05:41 2014 +0200
+
+    [l10n] Updated Catalan (Valencian) translation
+
+M	po/[e-mail]
+
+commit 18c69f54cb1ba23d685193117e6437f6d0a4c30e
+Author: Piotr Drąg <[e-mail]>
+Date:	Thu Apr 24 18:03:16 2014 +0200
+
+    Updated POTFILES.in
+
+M	po/POTFILES.in
+
+commit 47fa1cea586a34395dd82f13bfb1a197beff11f5
+Author: Iain Lane <[e-mail]>
+Date:	Thu Apr 24 11:49:26 2014 +0100
+
+    Use a traditional title bar when requested
+
+    Not all environments desire header bars. We use the
+    'gtk-shell-shows-menubar' setting to decide whether to use the header
+    bar.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=728866
+
+M	Makefile.am
+M	data/cheese-main-window.ui
+M	data/cheese.gresource.xml
+A	data/headerbar.ui
+M	src/cheese-window.vala
+
+commit 23e8df7c35edfaee6363d66ab57de457b2f57e1e
+Author: Iain Lane <[e-mail]>
+Date:	Thu Apr 24 12:14:04 2014 +0100
+
+    Use avatar chooser headerbar only when requested
+
+    Use headerbar in the avatar chooser dialog only when necessary
+    according
+    to the "gtk-shell-shows-menubar" setting.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=728866
+
+M	libcheese/cheese-avatar-chooser.c
+
+commit bf662f0750ab9ede4e4b862b143c1817cb9a934d
+Author: Tom Tryfonidis <[e-mail]>
+Date:	Wed Apr 23 14:14:37 2014 +0300
+
+    Updated Greek translations - UI and doc
+
+M	help/el/el.po
+M	po/el.po
+
+commit e13d545a452e290d6e230d41fa9dfcca626a1e14
+Author: Dirgita <[e-mail]>
+Date:	Wed Apr 23 09:34:46 2014 +0000
+
+    Updated Indonesian translation
+
+M	po/id.po
+
+commit 8938a8c4d06a4c26146340206a50cb5483bca171
+Author: Reinout van Schouwen <[e-mail]>
+Date:	Sun Apr 20 23:31:53 2014 +0200
+
+    Updated Dutch translation by Erwin Poeze
+
+M	po/nl.po
+
+commit 7844ed8fb44143f66945541aad78eba896f3857c
+Author: RafaelFonseca <[e-mail]>
+Date:	Tue Apr 15 02:54:47 2014 +0000
+
+    Updated Brazilian Portuguese translation
+
+M	help/pt_BR/pt_BR.po
+
 commit bbe4cc0ba95fd0a22ae0010672fd7fdb3956f746
 Author: David King <[e-mail]>
-Date:   Mon Apr 14 20:22:14 2014 +0100
+Date:	Mon Apr 14 20:22:14 2014 +0100
 
     Update NEWS for 3.12.1 release
 

=== modified file 'INSTALL'
--- INSTALL	2013-12-15 04:02:52 +0000
+++ INSTALL	2014-06-11 21:45:53 +0000
@@ -12,8 +12,8 @@
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented

=== modified file 'Makefile.in'
--- Makefile.in	2014-05-02 17:49:55 +0000
+++ Makefile.in	2014-06-11 21:45:53 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -536,6 +536,7 @@
 VALAC = @VALAC@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
 XMLCATALOG = @XMLCATALOG@
 XMLLINT = @XMLLINT@
@@ -767,6 +768,7 @@
 	data/cheese-appmenu.ui \
 	data/cheese-main-window.ui \
 	data/cheese-prefs.ui \
+	data/headerbar.ui \
 	data/pixmaps/cheese-1.svg \
 	data/pixmaps/cheese-2.svg \
 	data/pixmaps/cheese-3.svg \
@@ -1027,8 +1029,8 @@
 $(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
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/cheese-config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -2203,10 +2205,16 @@
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
@@ -2248,9 +2256,10 @@
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \

=== modified file 'NEWS'
--- NEWS	2014-05-23 11:12:02 +0000
+++ NEWS	2014-06-11 21:45:53 +0000
@@ -1,6 +1,27 @@
 ChangeLog for Cheese
 --------------------
 
+version 3.12.2
+  - Use a traditional title bar when requested
+    Not all environments desire header bars. We use the
+    'gtk-dialogs-use-header' setting to decide whether to use the header
+    bar.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=728866
+  - Use avatar chooser headerbar only when requested
+    Use headerbar in the avatar chooser dialog only when necessary according
+    to the "gtk-dialogs-use-header" setting.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=728866
+  - Added/Updated Translations
+    - ca@valencia, courtesy of Pau Iranzo
+    - el, courtesy of Tom Tryfonidis
+    - id, courtesy of Dirgita
+    - nl, courtesy of Erwin Poeze
+  - Added/Updated Documentation
+    - el, courtesy of Tom Tryfonidis
+    - pt_BR, courtesy of Rafael Fonseca
+
 version 3.12.1
   - Fix Brazilian Portuguese help translation
   - Fix untranslated strings in libcheese

=== modified file 'aclocal.m4'
--- aclocal.m4	2014-05-02 17:49:55 +0000
+++ aclocal.m4	2014-06-11 21:45:53 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
@@ -32,10 +32,10 @@
 # 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.13'
+[am__api_version='1.14'
 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.13.4], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@
 # 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.13.4])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -418,6 +418,12 @@
 # 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.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -526,7 +532,48 @@
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell [e-mail] about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
 
 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
@@ -534,7 +581,6 @@
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # 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.
@@ -682,38 +728,6 @@
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999-2013 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_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])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
 # Copyright (C) 1997-2013 Free Software Foundation, Inc.
@@ -784,6 +798,70 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 1999-2013 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_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != 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
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 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_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
@@ -1536,31 +1614,45 @@
 
 # gnome-compiler-flags.m4
 #
-# serial 2
+# serial 3
 #
 
+dnl _GNOME_ARG_ENABLE_COMPILE_WARNINGS
+dnl
+dnl Helper macro of GNOME_COMPILE_WARNINGS(). Pulled in through AC_REQUIRE() so
+dnl that it is only expanded once.
+dnl
+m4_define([_GNOME_ARG_ENABLE_COMPILE_WARNINGS],
+[dnl
+AC_PROVIDE([$0])[]dnl
+AC_ARG_ENABLE([compile-warnings],
+              [AS_HELP_STRING([[--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@]],
+                              [Turn on compiler warnings])],
+              [enable_compile_warnings=$enableval],
+              [enable_compile_warnings=yes])[]dnl
+])
+
 dnl GNOME_COMPILE_WARNINGS
 dnl Turn on many useful compiler warnings and substitute the result into
-dnl WARN_CFLAGS
-dnl For now, only works on GCC
+dnl WARN_CFLAGS for C and WARN_CXXFLAGS for C++.
+dnl Use AC_LANG_PUSH to set the language before calling this macro, or it will
+dnl use C as the default.
 dnl Pass the default value of the --enable-compile-warnings configure option as
 dnl the first argument to the macro, defaulting to 'yes'.
 dnl Additional warning/error flags can be passed as an optional second argument.
 dnl
 dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar])
 AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+    AC_REQUIRE([_GNOME_ARG_ENABLE_COMPILE_WARNINGS])[]dnl
+
     dnl ******************************
     dnl More compiler warnings
     dnl ******************************
 
-    AC_ARG_ENABLE(compile-warnings, 
-                  AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                                 [Turn on compiler warnings]),,
-                  [enable_compile_warnings="m4_default([$1],[yes])"])
-
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
+    AS_CASE([$ac_compile],
+            [[*'$CFLAGS '*]], [warn_lang=C warn_cc=$CC warn_conftest="conftest.[$]{ac_ext-c}"],
+            [[*'$CXXFLAGS '*]], [warn_lang='C++' warn_cc=$CXX warn_conftest="conftest.[$]{ac_ext-cc}"],
+            [AC_MSG_ERROR([[current language is neither C nor C++]])])
 
     warning_flags=
     realsave_CFLAGS="$CFLAGS"
@@ -1611,26 +1703,33 @@
         warning_flags="$warning_flags -Werror"
     fi
 
-    dnl Check whether GCC supports the warning options
+    dnl Keep in mind that the dummy source must be devoid of any
+    dnl problems that might cause diagnostics.
+    AC_LANG_CONFTEST([AC_LANG_SOURCE([[
+int main(int argc, char** argv) { return (argv != 0) ? argc : 0; }
+]])])
+
+    dnl Check whether compile supports the warning options
     for option in $warning_flags; 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
-	    tested_warning_flags="$tested_warning_flags $option"
-	fi
-	unset has_option
-	unset save_CFLAGS
+      # Test whether the compiler accepts the flag.  Look at standard output,
+      # since GCC only shows a warning message if an option is not supported.
+      warn_cc_out=`$warn_cc $tested_warning_flags $option -c "$warn_conftest" 2>&1 || echo failed`
+      rm -f "conftest.[$]{OBJEXT-o}"
+
+      AS_IF([test "x$warn_cc_out" = x],
+            [AS_IF([test "x$tested_warning_flags" = x],
+                   [tested_warning_flags=$option],
+                   [tested_warning_flags="$tested_warning_flags $option"])],
+[cat <<_WARNEOF >&AS_MESSAGE_LOG_FD
+$warn_cc: $warn_cc_out
+_WARNEOF
+])
     done
     unset option
-    CFLAGS="$realsave_CFLAGS"
-    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-    AC_MSG_RESULT($tested_warning_flags)
+    rm -f "$mm_conftest"
+
+    AC_MSG_CHECKING([what warning flags to pass to the $warn_lang compiler])
+    AC_MSG_RESULT([$tested_warning_flags])
 
     AC_ARG_ENABLE(iso-c,
                   AS_HELP_STRING([--enable-iso-c],
@@ -1653,8 +1752,10 @@
     fi
     AC_MSG_RESULT($complCFLAGS)
 
-    WARN_CFLAGS="$tested_warning_flags $complCFLAGS"
-    AC_SUBST(WARN_CFLAGS)
+dnl TODO subst to cxxflags with c++ and cflags with c
+    AS_IF([test "x$warn_lang" = "xC"],
+          [AC_SUBST([WARN_CFLAGS], [$tested_warning_flags $complCFLAGS])],
+          [AC_SUBST([WARN_CXXFLAGS], [$tested_warning_flags $complCFLAGS])])
 ])
 
 dnl For C++, do basically the same thing.

=== modified file 'build-aux/config.guess'
--- build-aux/config.guess	2013-12-15 04:02:52 +0000
+++ build-aux/config.guess	2014-06-11 21:45:53 +0000
@@ -1,10 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-12-29'
+timestamp='2013-11-29'
 
 # 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
@@ -26,7 +24,7 @@
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner. 
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
@@ -52,9 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2013 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."
@@ -136,6 +132,27 @@
 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|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#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
@@ -857,21 +874,21 @@
 	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-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -884,59 +901,54 @@
 	  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 ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	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
@@ -955,54 +967,63 @@
 	#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; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-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 ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	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.
@@ -1235,19 +1256,31 @@
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)

=== modified file 'build-aux/config.sub'
--- build-aux/config.sub	2013-12-15 04:02:52 +0000
+++ build-aux/config.sub	2014-06-11 21:45:53 +0000
@@ -1,10 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-12-29'
+timestamp='2013-10-01'
 
 # 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
@@ -70,9 +68,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2013 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."
@@ -256,12 +252,12 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc \
+	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
 	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
@@ -269,6 +265,7 @@
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -290,16 +287,17 @@
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
-	| or32 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -327,7 +325,7 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -369,13 +367,13 @@
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -384,6 +382,7 @@
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -407,12 +406,13 @@
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
@@ -796,7 +796,7 @@
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -832,7 +832,7 @@
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1354,7 +1354,7 @@
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1500,9 +1500,6 @@
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1551,6 +1548,9 @@
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
@@ -1594,6 +1594,9 @@
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;

=== modified file 'build-aux/missing'
--- build-aux/missing	2013-12-15 04:02:52 +0000
+++ build-aux/missing	2014-06-11 21:45:53 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <[e-mail]>, 1996.
@@ -160,7 +160,7 @@
       ;;
    autom4te*)
       echo "You might have modified some maintainer files that require"
-      echo "the 'automa4te' program to be rebuilt."
+      echo "the 'autom4te' program to be rebuilt."
       program_details 'autom4te'
       ;;
     bison*|yacc*)

=== modified file 'build-aux/test-driver'
--- build-aux/test-driver	2013-10-17 16:29:42 +0000
+++ build-aux/test-driver	2014-06-11 21:45:53 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2012-06-27.10; # UTC
+scriptversion=2013-07-13.22; # UTC
 
 # Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
@@ -44,13 +44,12 @@
 Usage:
   test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
               [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+              [--enable-hard-errors={yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
 END
 }
 
-# TODO: better error handling in option parsing (in particular, ensure
-# TODO: $log_file, $trs_file and $test_name are defined).
 test_name= # Used for reporting.
 log_file=  # Where to save the output of the test script.
 trs_file=  # Where to save the metadata of the test run.
@@ -69,10 +68,23 @@
   --enable-hard-errors) enable_hard_errors=$2; shift;;
   --) shift; break;;
   -*) usage_error "invalid option: '$1'";;
+   *) break;;
   esac
   shift
 done
 
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
 if test $color_tests = yes; then
   # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
   red='' # Red.

=== modified file 'cheese-config.h.in'
--- cheese-config.h.in	2012-02-07 00:39:22 +0000
+++ cheese-config.h.in	2014-06-11 21:45:53 +0000
@@ -43,9 +43,6 @@
    */
 #undef LT_OBJDIR
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 

=== modified file 'configure'
--- configure	2014-05-23 11:12:02 +0000
+++ configure	2014-06-11 21:45:53 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Cheese 3.12.1.
+# Generated by GNU Autoconf 2.69 for Cheese 3.12.2.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=cheese>.
 #
@@ -651,8 +651,8 @@
 # Identity of this package.
 PACKAGE_NAME='Cheese'
 PACKAGE_TARNAME='cheese'
-PACKAGE_VERSION='3.12.1'
-PACKAGE_STRING='Cheese 3.12.1'
+PACKAGE_VERSION='3.12.2'
+PACKAGE_STRING='Cheese 3.12.2'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=cheese'
 PACKAGE_URL='https://wiki.gnome.org/Apps/Cheese'
 
@@ -801,6 +801,7 @@
 GETTEXT_PACKAGE
 LIBCHEESE_GTK_LT_VERSION
 LIBCHEESE_LT_VERSION
+WARN_CXXFLAGS
 WARN_CFLAGS
 DISABLE_DEPRECATED
 CHEESE_WFLAGS
@@ -1511,7 +1512,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.12.1 to adapt to many kinds of systems.
+\`configure' configures Cheese 3.12.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1581,7 +1582,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Cheese 3.12.1:";;
+     short | recursive ) echo "Configuration of Cheese 3.12.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1728,7 +1729,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Cheese configure 3.12.1
+Cheese configure 3.12.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2097,7 +2098,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.12.1, which was
+It was created by Cheese $as_me 3.12.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2480,7 +2481,7 @@
 
 
 
-am__api_version='1.13'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2966,7 +2967,7 @@
 
 # Define the identity of the package.
  PACKAGE='cheese'
- VERSION='3.12.1'
+ VERSION='3.12.2'
 
 
 # Some tools Automake needs.
@@ -3008,6 +3009,47 @@
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell [e-mail] about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 
 { $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; }
@@ -3860,6 +3902,65 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != 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
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -4052,131 +4153,6 @@
 fi
 
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# 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
-
 
 # Extract the first word of "valac", so it can be a program name with args.
 set dummy valac; ac_word=$2
@@ -11981,19 +11957,24 @@
 
 
 
-
-
-    # Check whether --enable-compile-warnings was given.
+# Check whether --enable-compile-warnings was given.
 if test "${enable_compile_warnings+set}" = set; then :
-  enableval=$enable_compile_warnings;
+  enableval=$enable_compile_warnings; enable_compile_warnings=$enableval
 else
-  enable_compile_warnings="maximum"
+  enable_compile_warnings=yes
 fi
 
 
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
+
+
+    case $ac_compile in #(
+  *'$CFLAGS '*) :
+    warn_lang=C warn_cc=$CC warn_conftest="conftest.${ac_ext-c}" ;; #(
+  *'$CXXFLAGS '*) :
+    warn_lang='C++' warn_cc=$CXX warn_conftest="conftest.${ac_ext-cc}" ;; #(
+  *) :
+    as_fn_error $? "current language is neither C nor C++" "$LINENO" 5 ;;
+esac
 
     warning_flags=
     realsave_CFLAGS="$CFLAGS"
@@ -12035,41 +12016,37 @@
         warning_flags="$warning_flags -Werror"
     fi
 
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int main(int argc, char** argv) { return (argv != 0) ? argc : 0; }
+
+_ACEOF
+
         for option in $warning_flags; do
-	save_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $option"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
-$as_echo_n "checking whether gcc understands $option... " >&6; }
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  has_option=yes
-else
-  has_option=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	CFLAGS="$save_CFLAGS"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
-$as_echo "$has_option" >&6; }
-	if test $has_option = yes; then
-	    tested_warning_flags="$tested_warning_flags $option"
-	fi
-	unset has_option
-	unset save_CFLAGS
+      # Test whether the compiler accepts the flag.  Look at standard output,
+      # since GCC only shows a warning message if an option is not supported.
+      warn_cc_out=`$warn_cc $tested_warning_flags $option -c "$warn_conftest" 2>&1 || echo failed`
+      rm -f "conftest.${OBJEXT-o}"
+
+      if test "x$warn_cc_out" = x; then :
+  if test "x$tested_warning_flags" = x; then :
+  tested_warning_flags=$option
+else
+  tested_warning_flags="$tested_warning_flags $option"
+fi
+else
+  cat <<_WARNEOF >&5
+$warn_cc: $warn_cc_out
+_WARNEOF
+
+fi
     done
     unset option
-    CFLAGS="$realsave_CFLAGS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
-$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
+    rm -f "$mm_conftest"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the $warn_lang compiler" >&5
+$as_echo_n "checking what warning flags to pass to the $warn_lang compiler... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tested_warning_flags" >&5
 $as_echo "$tested_warning_flags" >&6; }
 
@@ -12099,8 +12076,13 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
 $as_echo "$complCFLAGS" >&6; }
 
-    WARN_CFLAGS="$tested_warning_flags $complCFLAGS"
-
+    if test "x$warn_lang" = "xC"; then :
+  WARN_CFLAGS=$tested_warning_flags $complCFLAGS
+
+else
+  WARN_CXXFLAGS=$tested_warning_flags $complCFLAGS
+
+fi
 
 
 #*******************************************************************************
@@ -12113,9 +12095,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=7:24:0
+LIBCHEESE_LT_VERSION=7:25:0
 
-LIBCHEESE_GTK_LT_VERSION=24:8:1
+LIBCHEESE_GTK_LT_VERSION=24:9:1
 
 
 #*******************************************************************************
@@ -15323,7 +15305,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.12.1, which was
+This file was extended by Cheese $as_me 3.12.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15390,7 +15372,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.12.1
+Cheese config.status 3.12.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2014-05-23 11:12:02 +0000
+++ configure.ac	2014-06-11 21:45:53 +0000
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.64])
 AC_INIT([Cheese],
-        [3.12.1],
+        [3.12.2],
         [https://bugzilla.gnome.org/enter_bug.cgi?product=cheese],
         [cheese],
         [https://wiki.gnome.org/Apps/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], [7:24:0])
-AC_SUBST([LIBCHEESE_GTK_LT_VERSION], [24:8:1])
+AC_SUBST([LIBCHEESE_LT_VERSION], [7:25:0])
+AC_SUBST([LIBCHEESE_GTK_LT_VERSION], [24:9:1])
 
 #*******************************************************************************
 # Internationalization

=== modified file 'data/cheese.desktop.in'
--- data/cheese.desktop.in	2014-05-23 11:12:02 +0000
+++ data/cheese.desktop.in	2014-06-11 21:45:53 +0000
@@ -12,4 +12,4 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=cheese
 X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.12.1
+X-GNOME-Bugzilla-Version=3.12.2

=== added file 'data/headerbar.ui'
--- data/headerbar.ui	1970-01-01 00:00:00 +0000
+++ data/headerbar.ui	2014-06-11 21:45:53 +0000
@@ -0,0 +1,10 @@
+<interface domain="cheese">
+  <object class="GtkHeaderBar" id="header_bar">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Take a Photo</property>
+    <property name="show-close-button">True</property>
+    <style>
+      <class name="titlebar"/>
+    </style>
+  </object>
+</interface>

=== removed file 'data/headerbar.ui'
--- data/headerbar.ui	2014-05-02 17:49:55 +0000
+++ data/headerbar.ui	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-<interface domain="cheese">
-  <object class="GtkHeaderBar" id="header_bar">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Take a Photo</property>
-    <property name="show-close-button">True</property>
-    <style>
-      <class name="titlebar"/>
-    </style>
-  </object>
-</interface>

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-23 11:12:02 +0000
+++ debian/changelog	2014-06-11 21:45:53 +0000
@@ -1,3 +1,11 @@
+cheese (3.12.2-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release.
+  * Drop 0001-Use-avatar-chooser-headerbar-only-when-requested.patch,
+    0002-Use-a-traditional-title-bar-when-requested.patch. Fixed upstream
+
+ -- Jackson Doak <[e-mail]>  Thu, 12 Jun 2014 07:35:08 +1000
+
 cheese (3.12.1-1ubuntu1) utopic; urgency=medium
 
   * Sync with Debian. Remaining changes:

=== removed file 'debian/patches/0001-Use-avatar-chooser-headerbar-only-when-requested.patch'
--- debian/patches/0001-Use-avatar-chooser-headerbar-only-when-requested.patch	2014-05-23 11:12:02 +0000
+++ debian/patches/0001-Use-avatar-chooser-headerbar-only-when-requested.patch	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-From 23e8df7c35edfaee6363d66ab57de457b2f57e1e Mon Sep 17 00:00:00 2001
-From: Iain Lane <[e-mail]>
-Date: Thu, 24 Apr 2014 12:14:04 +0100
-Subject: [PATCH 1/2] Use avatar chooser headerbar only when requested
-
-Use headerbar in the avatar chooser dialog only when necessary according
-to the "gtk-shell-shows-menubar" setting.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=728866
----
- libcheese/cheese-avatar-chooser.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/libcheese/cheese-avatar-chooser.c b/libcheese/cheese-avatar-chooser.c
-index 6750016..a0053b0 100644
---- a/libcheese/cheese-avatar-chooser.c
-+++ b/libcheese/cheese-avatar-chooser.c
-@@ -149,6 +149,21 @@ cheese_avatar_chooser_class_init (CheeseAvatarChooserClass *klass)
-   g_object_class_install_properties (object_class, PROP_LAST, properties);
- }
- 
-+static gboolean
-+dialogs_use_header (void)
-+{
-+    GtkSettings *settings;
-+    gboolean use_header;
-+
-+    settings = gtk_settings_get_default ();
-+
-+    g_object_get (G_OBJECT (settings),
-+                  "gtk-dialogs-use-header", &use_header,
-+                  NULL);
-+
-+    return use_header;
-+}
-+
- /**
-  * cheese_avatar_chooser_new:
-  *
-@@ -159,7 +174,8 @@ cheese_avatar_chooser_class_init (CheeseAvatarChooserClass *klass)
- GtkWidget *
- cheese_avatar_chooser_new (void)
- {
--  return g_object_new (CHEESE_TYPE_AVATAR_CHOOSER, NULL);
-+  return g_object_new (CHEESE_TYPE_AVATAR_CHOOSER, "use-header-bar",
-+                       dialogs_use_header (), NULL);
- }
- 
- /**
--- 
-2.0.0.rc0
-

=== removed file 'debian/patches/0002-Use-a-traditional-title-bar-when-requested.patch'
--- debian/patches/0002-Use-a-traditional-title-bar-when-requested.patch	2014-05-23 11:12:02 +0000
+++ debian/patches/0002-Use-a-traditional-title-bar-when-requested.patch	1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-From 47fa1cea586a34395dd82f13bfb1a197beff11f5 Mon Sep 17 00:00:00 2001
-From: Iain Lane <[e-mail]>
-Date: Thu, 24 Apr 2014 11:49:26 +0100
-Subject: [PATCH 2/2] Use a traditional title bar when requested
-
-Not all environments desire header bars. We use the
-'gtk-shell-shows-menubar' setting to decide whether to use the header
-bar.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=728866
----
- Makefile.am                |  1 +
- data/cheese-main-window.ui | 11 -----------
- data/cheese.gresource.xml  |  1 +
- data/headerbar.ui          | 10 ++++++++++
- src/cheese-window.vala     | 27 ++++++++++++++++++++++-----
- 5 files changed, 34 insertions(+), 16 deletions(-)
- create mode 100644 data/headerbar.ui
-
-diff --git a/Makefile.am b/Makefile.am
-index c0bd8cd..350a673 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -201,6 +201,7 @@ noinst_resource_files = \
- 	data/cheese-appmenu.ui \
- 	data/cheese-main-window.ui \
- 	data/cheese-prefs.ui \
-+	data/headerbar.ui \
- 	data/pixmaps/cheese-1.svg \
- 	data/pixmaps/cheese-2.svg \
- 	data/pixmaps/cheese-3.svg \
-diff --git a/data/cheese-main-window.ui b/data/cheese-main-window.ui
-index 153edb8..05b1216 100644
---- a/data/cheese-main-window.ui
-+++ b/data/cheese-main-window.ui
-@@ -2,17 +2,6 @@
- <interface domain="cheese">
-   <requires lib="gtk+" version="3.10"/>
-     <template class="CheeseMainWindow" parent="GtkApplicationWindow">
--        <child type="titlebar">
--  <object class="GtkHeaderBar" id="header_bar">
--    <property name="visible">True</property>
--    <property name="can_focus">False</property>
--    <property name="title" translatable="yes">Take a Photo</property>
--    <property name="show-close-button">True</property>
--    <style>
--      <class name="titlebar"/>
--    </style>
--  </object>
--        </child>
-         <child>
-   <object class="GtkBox" id="main_vbox">
-     <property name="orientation">vertical</property>
-diff --git a/data/cheese.gresource.xml b/data/cheese.gresource.xml
-index bf1bdaa..4d02eea 100644
---- a/data/cheese.gresource.xml
-+++ b/data/cheese.gresource.xml
-@@ -6,6 +6,7 @@
-         <file preprocess="xml-stripblanks">cheese-appmenu.ui</file>
-         <file preprocess="xml-stripblanks">cheese-main-window.ui</file>
-         <file preprocess="xml-stripblanks">cheese-prefs.ui</file>
-+        <file preprocess="xml-stripblanks">headerbar.ui</file>
-         <file>pixmaps/cheese-1.svg</file>
-         <file>pixmaps/cheese-2.svg</file>
-         <file>pixmaps/cheese-3.svg</file>
-diff --git a/data/headerbar.ui b/data/headerbar.ui
-new file mode 100644
-index 0000000..05be621
---- /dev/null
-+++ b/data/headerbar.ui
-@@ -0,0 +1,10 @@
-+<interface domain="cheese">
-+  <object class="GtkHeaderBar" id="header_bar">
-+    <property name="can_focus">False</property>
-+    <property name="title" translatable="yes">Take a Photo</property>
-+    <property name="show-close-button">True</property>
-+    <style>
-+      <class name="titlebar"/>
-+    </style>
-+  </object>
-+</interface>
-diff --git a/src/cheese-window.vala b/src/cheese-window.vala
-index ef4b412..eecd260 100644
---- a/src/cheese-window.vala
-+++ b/src/cheese-window.vala
-@@ -47,7 +47,8 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
- 
-     private Clutter.Script clutter_builder;
- 
--    [GtkChild]
-+    private Gtk.Builder header_bar_ui = new Gtk.Builder.from_resource ("/org/gnome/Cheese/headerbar.ui");
-+
-     private Gtk.HeaderBar header_bar;
- 
-     private GLib.Settings settings;
-@@ -123,6 +124,16 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
-     {
-         GLib.Object (application: application);
- 
-+        header_bar = header_bar_ui.get_object ("header_bar") as Gtk.HeaderBar;
-+
-+        Gtk.Settings settings = Gtk.Settings.get_default ();
-+
-+        if (settings.gtk_dialogs_use_header)
-+        {
-+            header_bar.visible = true;
-+            this.set_titlebar (header_bar);
-+        }
-+
-         if (get_direction () == Gtk.TextDirection.RTL)
-         {
-             effects_prev_page_button_image.icon_name = "go-previous-rtl-symbolic";
-@@ -135,6 +146,12 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
-         }
-     }
- 
-+    private void set_window_title (string title)
-+    {
-+        header_bar.set_title (title);
-+        this.set_title (title);
-+    }
-+
-     private bool on_window_state_change_event (Gtk.Widget widget,
-                                                Gdk.EventWindowState event)
-     {
-@@ -1316,22 +1333,22 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
-     {
-         if (is_effects_selector_active)
-         {
--            header_bar.set_title (_("Choose an Effect"));
-+            set_window_title (_("Choose an Effect"));
-         }
-         else
-         {
-             switch (current_mode)
-             {
-                 case MediaMode.PHOTO:
--                    header_bar.set_title (_("Take a Photo"));
-+                    set_window_title (_("Take a Photo"));
-                     break;
- 
-                 case MediaMode.VIDEO:
--                    header_bar.set_title (_("Record a Video"));
-+                    set_window_title (_("Record a Video"));
-                     break;
- 
-                 case MediaMode.BURST:
--                    header_bar.set_title (_("Take Multiple Photos"));
-+                    set_window_title (_("Take Multiple Photos"));
-                     break;
-             }
-         }
--- 
-2.0.0.rc0
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-05-23 11:12:02 +0000
+++ debian/patches/series	2014-06-11 21:45:53 +0000
@@ -1,3 +1,1 @@
 use-plugins-good
-0001-Use-avatar-chooser-headerbar-only-when-requested.patch
-0002-Use-a-traditional-title-bar-when-requested.patch

=== modified file 'docs/reference/Makefile.in'
--- docs/reference/Makefile.in	2014-05-02 17:49:55 +0000
+++ docs/reference/Makefile.in	2014-06-11 21:45:53 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -449,6 +449,7 @@
 VALAC = @VALAC@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
 XMLCATALOG = @XMLCATALOG@
 XMLLINT = @XMLLINT@

=== modified file 'docs/reference/html/index.html'
--- docs/reference/html/index.html	2014-05-23 11:12:02 +0000
+++ docs/reference/html/index.html	2014-06-11 21:45:53 +0000
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Cheese Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for cheese 3.12.1
+      for cheese 3.12.2
 .
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="http://developer.gnome.org/cheese/unstable/" target="_top">http://developer.gnome.org/cheese/unstable/</a>.

=== modified file 'help/Makefile.in'
--- help/Makefile.in	2014-05-02 17:49:55 +0000
+++ help/Makefile.in	2014-06-11 21:45:53 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -232,6 +232,7 @@
 VALAC = @VALAC@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
 XMLCATALOG = @XMLCATALOG@
 XMLLINT = @XMLLINT@

=== modified file 'help/el/burst-mode.page'
--- help/el/burst-mode.page	2014-05-02 17:49:55 +0000
+++ help/el/burst-mode.page	2014-06-11 21:45:53 +0000
@@ -21,53 +21,48 @@
 
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
-    <desc>Capture several photos with one button press in <gui>Burst</gui> mode. Change your pose in between each shot!</desc>
+    <desc>Λήψη πολλών φωτογραφιών με πάτημα ενός κουμπιού, Πατήστε στη λειτουργία <gui>Πολλαπλή φωτογράφηση</gui> . Αλλάξτε πόζα ανάμεσα σε κάθε φωτογραφία!</desc>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>  Δημήτρης Σπίγγος</mal:name>
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
       <mal:email>[e-mail]</mal:email>
       <mal:years>2013, 2014</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>  Ευστάθιος Ιωσηφίδης</mal:name>
+      <mal:name> Ευστάθιος Ιωσηφίδης</mal:name>
       <mal:email>[e-mail]</mal:email>
       <mal:years>2011</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>  Θάνος Τρυφωνίδης</mal:name>
+      <mal:name> Θάνος Τρυφωνίδης</mal:name>
       <mal:email>[e-mail]</mal:email>
       <mal:years>2012</mal:years>
     </mal:credit>
   </info>
 
-  <title>Take photos in quick succession</title>
+  <title>Λήψη φωτογραφιών με γρήγορη διαδοχή</title>
 
-  <p>Χρησιμοποιήσετε την λειτουργία <gui>Πολλαπλής φωτογράφησης</gui> για να τραβήξετε αυτόματα πολλές φωτογραφίες στη σειρά. Είναι διασκεδαστικό αν αλλάζετε πόζες ανάμεσα στις φωτογραφίες! Για να χρησιμοποιήσετε την λειτουργία <gui>Πολλαπλής φωτογράφησης</gui>:</p>
+  <p>Χρησιμοποιήσετε τη λειτουργία <gui>Πολλαπλή φωτογράφηση</gui> για να τραβήξετε αυτόματα πολλές φωτογραφίες στη σειρά. Είναι ιδιαίτερα διασκεδαστικό αν αλλάζετε πόζα ανάμεσα στις φωτογραφίες! Για να χρησιμοποιήσετε τη λειτουργία <gui>Πολλαπλή φωτογράφηση</gui>:</p>
 
   <steps>
     <item>
-      <p>Make sure that you are in <gui>Burst</gui> mode. If you are, the
-      <gui style="button">Burst</gui> button will be selected on the left side
-      of the screen.</p>
-    </item>
-    <item>
-      <p>Click the <gui style="button">Take multiple photos using a
-      webcam</gui> button in the middle of the bottom panel, or press the
-      <key>Space</key> key, to start taking photos.</p>
-      <p>Από προεπιλογή, τέσσερις φωτογραφίες θα τραβηχτούν, με καθυστέρηση ενός δευτερολέπτου και αντίστροφη μέτρηση ανάμεσα στις φωτογραφίες.</p>
-    </item>
-    <item>
-      <p>To stop recording, press the same button again. You can also press the
-      <key>Esc</key> or <key>Space</key> key to stop recording.</p>
+      <p>Βεβαιωθείτε πως βρίσκεσθε στη λειτουργία <gui>Πολλαπλή φωτογράφηση</gui> . Αν αυτό ισχύει, θα επιλεγεί το κουμπί <gui style="button">Πολλαπλή φωτογράφηση</gui>  στην αριστερή πλευρά της οθόνης.</p>
+    </item>
+    <item>
+      <p>Πατήστε το κουμπί <gui style="button">Λήψη πολλαπλών φωτογραφιών με χρήση δικτυακής κάμερας</gui> στη μέση του κάτω πίνακα, ή πατήστε το πλήκτρο <key>Space</key>, για να αρχίσετε να βγάζετε φωτογραφίες.</p>
+      <p>Από προεπιλογή, θα λαμβάνονται τέσσερις φωτογραφίες, με καθυστέρηση ενός δευτερολέπτου και αντίστροφη μέτρηση ανάμεσα στις φωτογραφίες.</p>
+    </item>
+    <item>
+      <p>Για να διακοπεί η εγγραφή, πατήστε ξανά το ίδιο κουμπί. Μπορείτε επίσης να πατήσετε το πλήκτρο <key>Esc</key> ή το <key>Space</key> για να σταματήσει η εγγραφή.</p>
     </item>
   </steps>
 
 <section id="burst-preferences">
-  <title>Αλλαγή προτιμήσεων <gui>Πολλαπλής φωτογράφησης</gui></title>
+  <title>Αλλαγή προτιμήσεων για την <gui>Πολλαπλή φωτογράφηση</gui></title>
 
-  <p>Μπορείτε να αλλάξετε πόσες φωτογραφίες θα βγαίνουν σε κάθε πολλαπλή φωτογράφηση και την διάρκεια της καθυστέρησης ανάμεσα τους:</p>
+  <p>Μπορείτε να αλλάξετε το πόσες φωτογραφίες θα λαμβάνονται σε κάθε πολλαπλή φωτογράφηση, καθώς και τη διάρκεια της καθυστέρησης ανάμεσα στις φωτογραφίες:</p>
 
   <steps>
     <item>
@@ -78,11 +73,11 @@
       <terms>
         <item>
           <title>Αντίστροφη μέτρηση</title>
-          <p>Αντίστροφη μέτρηση από το τρία πριν να ληφθεί η φωτογραφία.</p>
+          <p>Αντίστροφη μέτρηση από το τρία, πριν τη λήψη της φωτογραφίας.</p>
         </item>
         <item>
-          <title>Ενεργοποίηση αναλαμπής</title>
-          <p>Η οθόνη σας θα λάμψει όταν λαμβάνεται η φωτογραφία.</p>
+          <title>Ενεργοποίηση φλας</title>
+          <p>Η οθόνη σας θα λάμψει κατά τη λήψη της φωτογραφίας.</p>
         </item>
         <item>
           <title>Αριθμός φωτογραφιών</title>
@@ -90,9 +85,7 @@
         </item>
         <item>
           <title>Καθυστέρηση μεταξύ φωτογραφιών (δευτερόλεπτα)</title>
-          <p>The delay between two photos. If you have the <gui>Countdown</gui>
-          enabled, then this delay needs to be set to over four seconds for it
-          to have any effect.</p>
+          <p>Η καθυστέρηση ανάμεσα σε δύο φωτογραφίες. Αν έχετε ενεργοποιήσει την <gui>Αντίστροφη μέτρηση</gui>, τότε αυτή η καθυστέρηση πρέπει να ορισθεί σε πάνω από τέσσερα δευτερόλεπτα για να μπορεί να έχει οποιοδήποτε αποτέλεσμα.</p>
           <!--<p>The delay between the last photo and the start of the next
           countdown. If <gui>Countdown</gui> is disabled, this is the delay
           between photos.</p>-->

=== modified file 'help/el/effects-apply.page'
--- help/el/effects-apply.page	2014-03-03 22:07:51 +0000
+++ help/el/effects-apply.page	2014-06-11 21:45:53 +0000
@@ -19,22 +19,22 @@
 
     <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
-    <desc>Προσθέστε διασκεδαστικά εφέ στις φωτογραφίες και βίντεο σας, όπως να κάνετε τον εαυτό σας πράσινο ή παραμορφώνοντας την εικόνα σαν καθρέφτες.</desc>
+    <desc>Προσθέστε διασκεδαστικά εφέ στις φωτογραφίες και βίντεο σας, όπως να μετατρέψετε τον εαυτό σας σε πράσινο, ή αλλοιώνοντας την εικόνα όπως σε έναν παραμορφωτικό καθρέφτη.</desc>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>  Δημήτρης Σπίγγος</mal:name>
+      <mal:name> Δημήτρης Σπίγγος</mal:name>
       <mal:email>[e-mail]</mal:email>
       <mal:years>2013, 2014</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>  Ευστάθιος Ιωσηφίδης</mal:name>
+      <mal:name> Ευστάθιος Ιωσηφίδης</mal:name>
       <mal:email>[e-mail]</mal:email>
       <mal:years>2011</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>  Θάνος Τρυφωνίδης</mal:name>
+      <mal:name> Θάνος Τρυφωνίδης</mal:name>
       <mal:email>[e-mail]</mal:email>
       <mal:years>2012</mal:years>
     </mal:credit>
@@ -46,21 +46,17 @@
 
   <steps>
     <item>
-      <p>Click <gui style="button">Effects</gui>.</p>
+      <p>Κάντε κλικ στα <gui style="button">Εφέ</gui>.</p>
     </item>
     <item>
-      <p>Select the effect you want to use by clicking one of the options or
-      select <gui>No Effect</gui> if you don't want to use one.</p>
+      <p>Επιλέξτε τα τα εφέ που θέλετε να χρησιμοποιήσετε, κάνοντας κλικ σε μια από τις επιλογές, ή επιλέξτε το <gui>Χωρίς εφέ</gui> αν δε θέλετε να χρησιμοποιήσετε κάτι τέτοιο.</p>
     </item>
   </steps>
 
-  <p><app>Cheese</app> offers 35 effects, of which only 9 are shown on the
-  first page. Click the back and forward arrows next to
-  <gui style="button">Effects</gui> to navigate to the other pages.</p>
+  <p>Το <app>Cheese</app> προσφέρει 35 εφέ,από τα οποία μόνο τα 9 εμφανίζονται στην πρώτη σελίδα. Κάντε κλικ στα βέλη προς τα εμπρός και προς τα πίσω, δίπλα στα <gui>Εφέ</gui> για να περιηγηθείτε στις άλλες σελίδες.</p>
 
   <figure>
-    <title>Some of the effects, from left to right: Sepia, Shagadelic, Sobel
-    (first row), Waveform, X-Ray, Warp (second row)</title>
+    <title>Μερικά από τα εφέ, από τα αριστερά προς στα δεξιά: Sepia, Shagadelic, Sobel (first row), Κυμματομορφή, Ακτίνες X, Warp (second row), Διόγκωση, Άκρη και Καθρέφτες</title>
     <media its:translate="no" type="image" src="figures/effects.png" width="529" height="264"/>
   </figure>
 

=== modified file 'help/el/el.po'
--- help/el/el.po	2014-05-02 17:49:55 +0000
+++ help/el/el.po	2014-06-11 21:45:53 +0000
@@ -4,16 +4,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-devel-docs master\n"
-"POT-Creation-Date: 2014-01-11 22:26+0000\n"
-"PO-Revision-Date: 2014-01-11 17:37+0300\n"
-"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <[e-mail]>\n"
+"POT-Creation-Date: 2014-04-23 03:02+0000\n"
+"PO-Revision-Date: 2014-04-23 14:01+0200\n"
+"Last-Translator: Tom Tryfonidis <[e-mail]>\n"
 "Language-Team: www.gnome.gr\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 1.6.4\n"
 "X-Project-Style: gnome\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
@@ -21,153 +21,128 @@
 msgid "translator-credits"
 msgstr ""
 "Ελληνική μεταφραστική ομάδα GNOME\n"
-"  Δημήτρης Σπίγγος <[e-mail]>, 2013, 2014\n"
-"  Ευστάθιος Ιωσηφίδης <[e-mail]>, 2011\n"
-"  Θάνος Τρυφωνίδης <[e-mail]>, 2012\n"
+" Δημήτρης Σπίγγος <[e-mail]>, 2013, 2014\n"
+" Ευστάθιος Ιωσηφίδης <[e-mail]>, 2011\n"
+" Θάνος Τρυφωνίδης <[e-mail]>, 2012\n"
+" Μαρία Θουκυδίδου <[e-mail]>\n"
 "Για περισσότερα δείτε http://www.gnome.gr/."
 
 #. (itstool) path: credit/name
-#: C/index.page:9 C/burst-mode.page:13 C/effects-apply.page:9
-#: C/introduction.page:14 C/photo-delete.page:10 C/photo-save.page:10
-#: C/photo-take.page:18 C/photo-view.page:10 C/pref-countdown.page:13
-#: C/pref-flash.page:13 C/pref-image-properties.page:14
-#: C/pref-resolution.page:12 C/video-record.page:13
+#: C/burst-mode.page:14 C/effects-apply.page:13 C/index.page:12
+#: C/introduction.page:15 C/photo-delete.page:13 C/photo-save.page:13
+#: C/photo-take.page:19 C/photo-view.page:13 C/pref-countdown.page:14
+#: C/pref-flash.page:14 C/pref-image-properties.page:15
+#: C/pref-resolution.page:13 C/video-record.page:14
 msgid "Julita Inca"
 msgstr "Julita Inca"